From: srinivas.kandagatla@linaro.org (Srinivas Kandagatla)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] nvmem: core: Fix memory leak in nvmem_cell_write
Date: Wed, 30 Sep 2015 13:36:10 +0100 [thread overview]
Message-ID: <1443616570-17825-1-git-send-email-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <1443616298-17389-1-git-send-email-srinivas.kandagatla@linaro.org>
From: Axel Lin <axel.lin@ingics.com>
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>
---
drivers/nvmem/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 676607c..6fd4e5a 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))
--
1.9.1
next prev parent reply other threads:[~2015-09-30 12:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 12:31 [PATCH 0/4] nvmem: fixes for next rc Srinivas Kandagatla
2015-09-30 12:33 ` [PATCH 1/4] nvmem: core: fix the out-of-range leak in read/write() Srinivas Kandagatla
2015-09-30 12:35 ` [PATCH 2/4] nvmem: core: Handle shift bits in-place if cell->nbits is non-zero Srinivas Kandagatla
2015-09-30 12:36 ` Srinivas Kandagatla [this message]
2015-09-30 12:36 ` [PATCH 4/4] nvmem: sunxi: Check for memory allocation failure Srinivas Kandagatla
2015-10-04 11:04 ` Greg KH
2015-10-04 14:40 ` Srinivas Kandagatla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443616570-17825-1-git-send-email-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).