summaryrefslogtreecommitdiffstats
path: root/drivers/nvmem
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-09-30 14:36:10 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 13:09:43 +0200
commitace22170655f61d82fff95e57d673bf847a32a03 (patch)
tree5a4543e05214b84bedc1d52ac14db14c67a5d559 /drivers/nvmem
parentnvmem: core: Handle shift bits in-place if cell->nbits is non-zero (diff)
downloadlinux-ace22170655f61d82fff95e57d673bf847a32a03.tar.xz
linux-ace22170655f61d82fff95e57d673bf847a32a03.zip
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>
Diffstat (limited to 'drivers/nvmem')
-rw-r--r--drivers/nvmem/core.c2
1 files changed, 1 insertions, 1 deletions
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))