[PATCH] xen/sched_rc: Fix memory leak in rt_init()

[PATCH] xen/sched_rc: Fix memory leak in rt_init()

[Andrew Cooper]

Introduced by c/s 376bbba "sched_rt: print useful affinity info when dumping".
If the allocation of cpumask failed, prv was leaked.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Coverity-ID: 1304398
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
CC: Dario Faggioli <dario.faggioli@citrix.com>
CC: George Dunlap <george.dunlap@eu.citrix.com>
CC: Meng Xu <mengxu@cis.upenn.edu>
---
 xen/common/sched_rt.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index 5836d27..4372486 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -441,7 +441,7 @@ static inline struct list_head *rt_depletedq(const struct scheduler *ops)
     {
         _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids);
         if ( !_cpumask_scratch )
-            return -ENOMEM;
+            goto no_mem;
     }
     nr_rt_ops++;
 
@@ -455,6 +455,10 @@ static inline struct list_head *rt_depletedq(const struct scheduler *ops)
     ops->sched_data = prv;
 
     return 0;
+
+ no_mem:
+    xfree(prv);
+    return -ENOMEM;
 }
 
 static void
-- 
1.7.10.4

Re: [PATCH] xen/sched_rc: Fix memory leak in rt_init()

[Dario Faggioli]

[-- Attachment #1.1: Type: text/plain, Size: 1587 bytes --]

On Fri, 2015-06-05 at 10:49 +0100, Andrew Cooper wrote:
> Introduced by c/s 376bbba "sched_rt: print useful affinity info when dumping".
> If the allocation of cpumask failed, prv was leaked.
> 
Wow... I really did a _great_ job with that patch, didn't I? :-//

> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Coverity-ID: 1304398
> CC: Keir Fraser <keir@xen.org>
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Dario Faggioli <dario.faggioli@citrix.com>
> CC: George Dunlap <george.dunlap@eu.citrix.com>
> CC: Meng Xu <mengxu@cis.upenn.edu>
>
Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>

Although, I'd rather...

> diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
> index 5836d27..4372486 100644
> --- a/xen/common/sched_rt.c
> +++ b/xen/common/sched_rt.c
> @@ -441,7 +441,7 @@ static inline struct list_head *rt_depletedq(const struct scheduler *ops)
>      {
>          _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids);
>          if ( !_cpumask_scratch )
> -            return -ENOMEM;
> +            goto no_mem;
>
free it right away here (just one added line), instead of "clobbering"
the tail of the function, since it's just this.

But, really, I'm ok with the fix as is. Thanks for taking the time of
sending the patch! :-)

Regards, Dario
-- 
<<This happens because I choose it to happen!>> (Raistlin Majere)
-----------------------------------------------------------------
Dario Faggioli, Ph.D, http://about.me/dario.faggioli
Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] xen/sched_rc: Fix memory leak in rt_init()

[Jan Beulich]

>>> On 05.06.15 at 11:49, <andrew.cooper3@citrix.com> wrote:
> Introduced by c/s 376bbba "sched_rt: print useful affinity info when 
> dumping".
> If the allocation of cpumask failed, prv was leaked.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Coverity-ID: 1304398

I took the liberty to commit this without your ack, as being an
obvious fix.

Jan