From mboxrd@z Thu Jan  1 00:00:00 1970
From: glommer@br.ibm.com (Glauber de Oliveira Costa)
Subject: [PATCH] Fix leak in blkback initialization
Date: Wed, 4 Jan 2006 15:15:06 +0000
Message-ID: <20060104151506.GA26795@br.ibm.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="6TrnltStXW4iwmi0"
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org


--6TrnltStXW4iwmi0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

In case of failing due to lack of memory in the system, blkif_init
potentially leaves a leak if some of the allocations was sucessfully
suceeded.

This patch frees the memory allocated, avoiding the leak.

Signed-off-by: Glauber de Oliveira Costa <glommer@br.ibm.com>
-- 
glommer

--6TrnltStXW4iwmi0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline; filename=blkback-leak

# HG changeset patch
# User root@kct
# Node ID 0b7920d3ca98c3c011b2756afcffb7e2c31b7d2d
# Parent  8f6d4878d02e65438dabda642d7bf84679dbd464

In case of failing due to lack of memory in the system, blkif_init
potentially leaves a leak if some of the allocations was sucessfully
suceeded. 

This patch frees the memory allocated, avoiding the leak. 

Signed-off-by: Glauber de Oliveira Costa <glommer@br.ibm.com>

diff -r 8f6d4878d02e -r 0b7920d3ca98 linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Tue Jan  3 19:01:55 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed Jan  4 13:55:33 2006
@@ -540,6 +540,9 @@
 	pending_vaddrs        = kmalloc(sizeof(pending_vaddrs[0]) *
 					mmap_pages, GFP_KERNEL);
 	if (!pending_reqs || !pending_grant_handles || !pending_vaddrs) {
+		kfree(pending_reqs);
+		kfree(pending_grant_handles);
+		kfree(pending_vaddrs);
 		printk("%s: out of memory\n", __FUNCTION__);
 		return -1;
 	}

--6TrnltStXW4iwmi0
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--6TrnltStXW4iwmi0--