lkml.org 
[lkml]   [2012]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] xen/blkback: prevent leak of mode during multiple backend_changed calls
Date
backend_changed might be called multiple times, which will leak
be->mode. free the previous value before storing the current mode value.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---

!! Not compile tested !!

drivers/block/xen-blkback/xenbus.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index a6585a4..8650b19 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -502,7 +502,7 @@ static void backend_changed(struct xenbus_watch *watch,
= container_of(watch, struct backend_info, backend_watch);
struct xenbus_device *dev = be->dev;
int cdrom = 0;
- char *device_type;
+ char *mode, *device_type;

DPRINTK("");

@@ -528,13 +528,15 @@ static void backend_changed(struct xenbus_watch *watch,
return;
}

- be->mode = xenbus_read(XBT_NIL, dev->nodename, "mode", NULL);
- if (IS_ERR(be->mode)) {
- err = PTR_ERR(be->mode);
+ mode = xenbus_read(XBT_NIL, dev->nodename, "mode", NULL);
+ kfree(be->mode);
+ if (IS_ERR(mode)) {
+ err = PTR_ERR(mode);
be->mode = NULL;
xenbus_dev_fatal(dev, err, "reading mode");
return;
}
+ be->mode = mode;

device_type = xenbus_read(XBT_NIL, dev->otherend, "device-type", NULL);
if (!IS_ERR(device_type)) {
@@ -555,7 +557,7 @@ static void backend_changed(struct xenbus_watch *watch,
be->minor = minor;

err = xen_vbd_create(be->blkif, handle, major, minor,
- (NULL == strchr(be->mode, 'w')), cdrom);
+ (NULL == strchr(mode, 'w')), cdrom);
if (err) {
be->major = 0;
be->minor = 0;
--
1.8.0.1


\
 
 \ /
  Last update: 2012-12-05 11:42    [W:0.074 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site