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

Commit 26674600 authored by Bang Li's avatar Bang Li Committed by Greg Kroah-Hartman
Browse files

mtdblock: tolerate corrected bit-flips 



commit 0c3089601f064d80b3838eceb711fcac04bceaad upstream.

mtd_read() may return -EUCLEAN in case of corrected bit-flips.This
particular condition should not be treated like an error.

Signed-off-by: default avatarBang Li <libang.linuxer@gmail.com>
Fixes: e47f6858 ("mtd: check for max_bitflips in mtd_read_oob()")
Cc: <stable@vger.kernel.org> # v3.7
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230328163012.4264-1-libang.linuxer@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50dbfd9d

drivers/mtd/mtdblock.c

+8 −4
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos, 
				mtdblk->cache_state = STATE_EMPTY;

				ret = mtd_read(mtd, sect_start, sect_size,

					       &retlen, mtdblk->cache_data);

				if (ret)

				if (ret && !mtd_is_bitflip(ret))

					return ret;

				if (retlen != sect_size)

					return -EIO;
@@ -185,8 +185,12 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos, 
	pr_debug("mtdblock: read on \"%s\" at 0x%lx, size 0x%x\n",

			mtd->name, pos, len);



	if (!sect_size)

		return mtd_read(mtd, pos, len, &retlen, buf);

	if (!sect_size) {

		ret = mtd_read(mtd, pos, len, &retlen, buf);

		if (ret && !mtd_is_bitflip(ret))

			return ret;

		return 0;

	}



	while (len > 0) {

		unsigned long sect_start = (pos/sect_size)*sect_size;
@@ -206,7 +210,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos, 
			memcpy (buf, mtdblk->cache_data + offset, size);

		} else {

			ret = mtd_read(mtd, pos, size, &retlen, buf);

			if (ret)

			if (ret && !mtd_is_bitflip(ret))

				return ret;

			if (retlen != size)

				return -EIO;