summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-01-05 11:18:21 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-09 13:44:54 +0100
commit4d3ba541bede68f9fc3d767396a94cfe20af6fbb (patch)
tree7de97ab61708481bb89328da8d0b3404fc04dd9f /drivers/mtd
parentda5b4cf021b9b239377a139e1d6a9055c89d984a (diff)
downloadlinux-stable-4d3ba541bede68f9fc3d767396a94cfe20af6fbb.tar.gz
linux-stable-4d3ba541bede68f9fc3d767396a94cfe20af6fbb.tar.bz2
linux-stable-4d3ba541bede68f9fc3d767396a94cfe20af6fbb.zip
Revert "mtd: spinand: Fix OOB read"
This reverts stable commit baad618d078c857f99cc286ea249e9629159901f. This commit is adding lines to spinand_write_to_cache_op, wheras the upstream commit 868cbe2a6dcee451bd8f87cbbb2a73cf463b57e5 that this was supposed to backport was touching spinand_read_from_cache_op. It causes a crash on writing OOB data by attempting to write to read-only kernel memory. Cc: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/spi/core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 671700af9180..0d21c68bfe24 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -317,10 +317,6 @@ static int spinand_write_to_cache_op(struct spinand_device *spinand,
buf += ret;
}
- if (req->ooblen)
- memcpy(req->oobbuf.in, spinand->oobbuf + req->ooboffs,
- req->ooblen);
-
return 0;
}