]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
sched/core: Fix &rd->cpudl memory leak
authorMathieu Poirier <mathieu.poirier@linaro.org>
Tue, 24 Jan 2017 21:11:35 +0000 (14:11 -0700)
committerIngo Molnar <mingo@kernel.org>
Mon, 30 Jan 2017 10:46:37 +0000 (11:46 +0100)
While in the process of initialising a root domain, if function
cpupri_init() fails the memory allocated in cpudl_init() is not
reclaimed.

Adding a new goto target to cleanup the previous initialistion of
the root_domain's dl_bw structure reclaims said memory.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1485292295-21298-2-git-send-email-mathieu.poirier@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sched/core.c

index 17d1df6e2dbb683543d6775f8a622d771e9506b8..d01f9d047397cea54b673b59617058ddaecdc3cb 100644 (file)
@@ -5979,9 +5979,11 @@ static int init_rootdomain(struct root_domain *rd)
                goto free_rto_mask;
 
        if (cpupri_init(&rd->cpupri) != 0)
-               goto free_rto_mask;
+               goto free_cpudl;
        return 0;
 
+free_cpudl:
+       cpudl_cleanup(&rd->cpudl);
 free_rto_mask:
        free_cpumask_var(rd->rto_mask);
 free_dlo_mask: