From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH 4/7] nvmem: meson-mx-efuse: allow reading data smaller than word_size
Date: Sun, 18 Aug 2019 10:33:42 +0100 [thread overview]
Message-ID: <20190818093345.29647-5-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20190818093345.29647-1-srinivas.kandagatla@linaro.org>
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Some Amlogic boards store the Ethernet MAC address inside the eFuse. The
Ethernet MAC address uses 6 bytes. The existing logic in
meson_mx_efuse_read() would write beyond the end of the data buffer when
trying to read data with a size that is not aligned to word_size (4
bytes on Meson8, Meson8b and Meson8m2).
Calculate the remaining data to copy inside meson_mx_efuse_read() so
reading 6 bytes doesn't write beyond the end of the data buffer.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/nvmem/meson-mx-efuse.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index b9f9ce089de9..07c9f38c1c60 100644
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -155,7 +155,8 @@ static int meson_mx_efuse_read(void *context, unsigned int offset,
if (err)
break;
- memcpy(buf + i, &tmp, efuse->config.word_size);
+ memcpy(buf + i, &tmp,
+ min_t(size_t, bytes - i, efuse->config.word_size));
}
meson_mx_efuse_mask_bits(efuse, MESON_MX_EFUSE_CNTL1,
--
2.21.0
next prev parent reply other threads:[~2019-08-18 9:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-18 9:33 [PATCH 0/7] nvmem: patches(set 1) for 5.4 Srinivas Kandagatla
2019-08-18 9:33 ` [PATCH 1/7] dt-bindings: imx-ocotp: Add i.MX8MN compatible Srinivas Kandagatla
2019-08-18 9:33 ` [PATCH 2/7] nvmem: imx-ocotp: Add i.MX8MN support Srinivas Kandagatla
2019-08-18 9:33 ` [PATCH 3/7] nvmem: sunxi_sid: fix A64 SID controller support Srinivas Kandagatla
2019-08-18 9:33 ` Srinivas Kandagatla [this message]
2019-08-18 9:33 ` [PATCH 5/7] nvmem: mxs-ocotp: update MODULE_AUTHOR() email address Srinivas Kandagatla
2019-08-18 9:33 ` [PATCH 6/7] dt-bindings: fsl: scu: add new compatible string for ocotp Srinivas Kandagatla
2019-08-18 9:33 ` [PATCH 7/7] nvmem: imx: add i.MX8QM platform support 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=20190818093345.29647-5-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=narmstrong@baylibre.com \
/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).