Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1306eb6 authored by Stanislav Meduna's avatar Stanislav Meduna Committed by Greg Kroah-Hartman
Browse files

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: c01e9a11 ("nvmem: add driver for ocotp in i.MX23 and i.MX28")
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarStanislav Meduna <stano@meduna.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1db488d1

drivers/nvmem/mxs-ocotp.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int mxs_ocotp_read(void *context, const void *reg, size_t reg_size, 
	if (ret)

		goto close_banks;



	while (val_size) {

	while (val_size >= reg_size) {

		if ((offset < OCOTP_DATA_OFFSET) || (offset % 16)) {

			/* fill up non-data register */

			*buf = 0;
@@ -103,7 +103,7 @@ static int mxs_ocotp_read(void *context, const void *reg, size_t reg_size, 
		}



		buf++;

		val_size--;

		val_size -= reg_size;

		offset += reg_size;

	}