[PATCH] powerpc/nvram: Fix a memory leak in err path

From	xinhui <xinhui.pan@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	[PATCH] powerpc/nvram: Fix a memory leak in err path
Date	2015-12-09 11:10 +0100
Message-ID	<qDJR8-6Yw-25@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

If kmemdup fails, We need kfree *buff* first then return -ENOMEM.
Otherwise there is a memory leak.

Signed-off-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>
---
 arch/powerpc/kernel/nvram_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 32e2652..21a278b7 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -542,9 +542,9 @@ static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
 			time->tv_nsec = 0;
 		}
 		*buf = kmemdup(buff + hdr_size, length, GFP_KERNEL);
+		kfree(buff);
 		if (*buf == NULL)
 			return -ENOMEM;
-		kfree(buff);
 
 		if (err_type == ERR_TYPE_KERNEL_PANIC_GZ)
 			*compressed = true;
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] powerpc/nvram: Fix a memory leak in err path xinhui <xinhui.pan@linux.vnet.ibm.com> - 2015-12-09 11:10 +0100
  Re: [PATCH] powerpc/nvram: Fix a memory leak in err path Nathan Fontenot <nfont@linux.vnet.ibm.com> - 2015-12-09 16:30 +0100
    Re: [PATCH] powerpc/nvram: Fix a memory leak in err path xinhui <xinhui@linux.vnet.ibm.com> - 2015-12-10 01:00 +0100

csiph-web