6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Cc: stable <stable@xxxxxxxxxx>
Reviewed-by: Peng Fan <peng.fan@xxxxxxx>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20241230141901.263976-2-srinivas.kandagatla@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/nvmem/imx-ocotp-ele.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- 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 *cont
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;
