summaryrefslogtreecommitdiffstats
path: root/drivers/xen/xenfs
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2010-12-20 23:56:09 +0100
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-12-20 23:56:09 +0100
commit6a5b3beff916a19e7672f8c0330b4f82ed367be2 (patch)
tree74f732476f73c04ea94c6f2e848e25a254ffa724 /drivers/xen/xenfs
parentxenbus: avoid zero returns from read() (diff)
downloadlinux-6a5b3beff916a19e7672f8c0330b4f82ed367be2.tar.xz
linux-6a5b3beff916a19e7672f8c0330b4f82ed367be2.zip
xenbus: Fix memory leak on release
Pending responses were leaked on close. Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen/xenfs')
-rw-r--r--drivers/xen/xenfs/xenbus.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/xen/xenfs/xenbus.c b/drivers/xen/xenfs/xenbus.c
index 55791dd1105f..8f6c7d4b3e4d 100644
--- a/drivers/xen/xenfs/xenbus.c
+++ b/drivers/xen/xenfs/xenbus.c
@@ -543,6 +543,7 @@ static int xenbus_file_release(struct inode *inode, struct file *filp)
struct xenbus_file_priv *u = filp->private_data;
struct xenbus_transaction_holder *trans, *tmp;
struct watch_adapter *watch, *tmp_watch;
+ struct read_buffer *rb, *tmp_rb;
/*
* No need for locking here because there are no other users,
@@ -561,6 +562,10 @@ static int xenbus_file_release(struct inode *inode, struct file *filp)
free_watch_adapter(watch);
}
+ list_for_each_entry_safe(rb, tmp_rb, &u->read_buffers, list) {
+ list_del(&rb->list);
+ kfree(rb);
+ }
kfree(u);
return 0;