diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2024-12-30 14:18:56 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 10:05:38 +0100 |
| commit | 6d8b8678151301e8381204d8ff9dfedc98f41e63 (patch) | |
| tree | 3e336c91d256c80a5cc5efe7fcb357fc20b60b29 /drivers/nvmem | |
| parent | 2c3109dcdaedce9ae9fb266d273f89156607acb0 (diff) | |
| download | linux-6d8b8678151301e8381204d8ff9dfedc98f41e63.tar.gz linux-6d8b8678151301e8381204d8ff9dfedc98f41e63.tar.bz2 linux-6d8b8678151301e8381204d8ff9dfedc98f41e63.zip | |
nvmem: imx-ocotp-ele: simplify read beyond device check
commit 343aa1e289e8e3dba5e3d054c4eb27da7b4e1ecc upstream.
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>
Diffstat (limited to 'drivers/nvmem')
| -rw-r--r-- | drivers/nvmem/imx-ocotp-ele.c | 6 |
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; |