Bläddra i källkod

nvmem: mxs-ocotp: fix buffer overflow in read

This patch fixes the issue where the mxs_ocotp_read is reading
the ocotp in reg_size steps but decrements the remaining size
by 1. The number of iterations is thus four times higher,
overwriting the area behind the output buffer.

Fixes: c01e9a11ab6f ("nvmem: add driver for ocotp in i.MX23 and i.MX28")
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Stanislav Meduna <stano@meduna.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stanislav Meduna 9 år sedan
förälder
incheckning
d1306eb675
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2 2
      drivers/nvmem/mxs-ocotp.c

+ 2 - 2
drivers/nvmem/mxs-ocotp.c

@@ -94,7 +94,7 @@ static int mxs_ocotp_read(void *context, const void *reg, size_t reg_size,
 	if (ret)
 	if (ret)
 		goto close_banks;
 		goto close_banks;
 
 
-	while (val_size) {
+	while (val_size >= reg_size) {
 		if ((offset < OCOTP_DATA_OFFSET) || (offset % 16)) {
 		if ((offset < OCOTP_DATA_OFFSET) || (offset % 16)) {
 			/* fill up non-data register */
 			/* fill up non-data register */
 			*buf = 0;
 			*buf = 0;
@@ -103,7 +103,7 @@ static int mxs_ocotp_read(void *context, const void *reg, size_t reg_size,
 		}
 		}
 
 
 		buf++;
 		buf++;
-		val_size--;
+		val_size -= reg_size;
 		offset += reg_size;
 		offset += reg_size;
 	}
 	}