From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 30 Sep 2015 12:36:10 +0000 (+0100)
Subject: nvmem: core: Fix memory leak in nvmem_cell_write
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ace22170655f61d82fff95e57d673bf847a32a03;p=openwrt%2Fstaging%2Fblogic.git

nvmem: core: Fix memory leak in nvmem_cell_write

A tmp buffer is allocated if cell->bit_offset || cell->nbits.
So the tmp buffer needs to be freed at the same condition to avoid leak.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 676607cb01bb..6fd4e5a5ef4a 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -938,7 +938,7 @@ int nvmem_cell_write(struct nvmem_cell *cell, void *buf, size_t len)
 	rc = regmap_raw_write(nvmem->regmap, cell->offset, buf, cell->bytes);
 
 	/* free the tmp buffer */
-	if (cell->bit_offset)
+	if (cell->bit_offset || cell->nbits)
 		kfree(buf);
 
 	if (IS_ERR_VALUE(rc))