summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2024-12-30 14:18:56 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-10 16:16:47 +0100
commit343aa1e289e8e3dba5e3d054c4eb27da7b4e1ecc (patch)
treeb393f7dea3bc70322413a1b5317da664892c38fd
parent5bd97a54da956ecf88992ea459dc0cccacc72c6d (diff)
nvmem: imx-ocotp-ele: simplify read beyond device check
Do the read beyond device check on function entry in bytes instead of 32bit words which is easier to follow. Fixes: 22e9e6fcfb50 ("nvmem: imx: support i.MX93 OCOTP") Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: stable <stable@kernel.org> Reviewed-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20241230141901.263976-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/nvmem/imx-ocotp-ele.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvmem/imx-ocotp-ele.c b/drivers/nvmem/imx-ocotp-ele.c
index 1ba494497698..2e186b7d3b04 100644
--- a/drivers/nvmem/imx-ocotp-ele.c
+++ b/drivers/nvmem/imx-ocotp-ele.c
@@ -72,13 +72,13 @@ static int imx_ocotp_reg_read(void *context, unsigned int offset, void *val, siz
void *p;
int i;
+ if (offset + bytes > priv->data->size)
+ bytes = priv->data->size - offset;
+
index = offset;
num_bytes = round_up(bytes, 4);
count = num_bytes >> 2;
- if (count > ((priv->data->size >> 2) - index))
- count = (priv->data->size >> 2) - index;
-
p = kzalloc(num_bytes, GFP_KERNEL);
if (!p)
return -ENOMEM;