All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH for-4.7] sched/rt: Fix memory leak in rt_init()
@ 2016-05-10 13:38 Andrew Cooper
  2016-05-10 13:52 ` Meng Xu
  2016-05-10 14:18 ` Wei Liu
  0 siblings, 2 replies; 5+ messages in thread
From: Andrew Cooper @ 2016-05-10 13:38 UTC (permalink / raw)
  To: Xen-devel; +Cc: George Dunlap, Andrew Cooper, Dario Faggioli, Wei Liu, Meng Xu

c/s 2656bc7b0 "xen: adopt .deinit_pdata and improve timer handling"
introduced a error path into rt_init() which leaked prv if the
allocation of prv->repl_timer failed.

Introduce an error cleanup path.

Spotted by Coverity.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Wei Liu <wei.liu2@citrix.com>
CC: George Dunlap <george.dunlap@eu.citrix.com>
CC: Dario Faggioli <dario.faggioli@citrix.com>
CC: Meng Xu <mengxu@cis.upenn.edu>
---
 xen/common/sched_rt.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index 7f8f411..aa3ffd2 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -581,6 +581,7 @@ replq_reinsert(const struct scheduler *ops, struct rt_vcpu *svc)
 static int
 rt_init(struct scheduler *ops)
 {
+    int rc = -ENOMEM;
     struct rt_private *prv = xzalloc(struct rt_private);
 
     printk("Initializing RTDS scheduler\n"
@@ -588,11 +589,11 @@ rt_init(struct scheduler *ops)
            "Use at your own risk.\n");
 
     if ( prv == NULL )
-        return -ENOMEM;
+        goto err;
 
     prv->repl_timer = xzalloc(struct timer);
     if ( prv->repl_timer == NULL )
-        return -ENOMEM;
+        goto err;
 
     spin_lock_init(&prv->lock);
     INIT_LIST_HEAD(&prv->sdom);
@@ -603,8 +604,16 @@ rt_init(struct scheduler *ops)
     cpumask_clear(&prv->tickled);
 
     ops->sched_data = prv;
+    rc = 0;
 
-    return 0;
+ err:
+    if ( rc && prv )
+    {
+        xfree(prv->repl_timer);
+        xfree(prv);
+    }
+
+    return rc;
 }
 
 static void
-- 
2.1.4


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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-10 14:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-10 13:38 [PATCH for-4.7] sched/rt: Fix memory leak in rt_init() Andrew Cooper
2016-05-10 13:52 ` Meng Xu
2016-05-10 13:57   ` Andrew Cooper
2016-05-10 14:18 ` Wei Liu
2016-05-10 14:18   ` Andrew Cooper

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.