aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.9/0040-nand-hack.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-08-17 10:51:05 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2017-08-17 12:34:34 +0200
commit2d02a4f5bda4a5ff392286360ec7d1129bd77d25 (patch)
treec243a9231fd508b585c2711e8b691e8ca06d2988 /target/linux/ramips/patches-4.9/0040-nand-hack.patch
parentd9564d79b8e91eed23c45afd2eb4a71a97c922eb (diff)
downloadupstream-2d02a4f5bda4a5ff392286360ec7d1129bd77d25.tar.gz
upstream-2d02a4f5bda4a5ff392286360ec7d1129bd77d25.tar.bz2
upstream-2d02a4f5bda4a5ff392286360ec7d1129bd77d25.zip
kernel: update 4.9 to 4.9.44
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/ramips/patches-4.9/0040-nand-hack.patch')
-rw-r--r--target/linux/ramips/patches-4.9/0040-nand-hack.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-4.9/0040-nand-hack.patch b/target/linux/ramips/patches-4.9/0040-nand-hack.patch
index 8cd919437c..64a325300e 100644
--- a/target/linux/ramips/patches-4.9/0040-nand-hack.patch
+++ b/target/linux/ramips/patches-4.9/0040-nand-hack.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
-@@ -2014,6 +2014,9 @@ static int nand_do_read_ops(struct mtd_i
+@@ -2022,6 +2022,9 @@ static int nand_do_read_ops(struct mtd_i
__func__, buf);
read_retry:
@@ -10,7 +10,7 @@
chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
/*
-@@ -2032,6 +2035,7 @@ read_retry:
+@@ -2040,6 +2043,7 @@ read_retry:
else
ret = chip->ecc.read_page(mtd, chip, bufpoi,
oob_required, page);
@@ -18,7 +18,7 @@
if (ret < 0) {
if (use_bufpoi)
/* Invalidate page cache */
-@@ -3195,8 +3199,11 @@ int nand_erase_nand(struct mtd_info *mtd
+@@ -3203,8 +3207,11 @@ int nand_erase_nand(struct mtd_info *mtd
(page + pages_per_block))
chip->pagebuf = -1;
@@ -31,7 +31,7 @@
/*
* See if operation failed and additional status checks are
* available
-@@ -4390,6 +4397,7 @@ int nand_scan_ident(struct mtd_info *mtd
+@@ -4398,6 +4405,7 @@ int nand_scan_ident(struct mtd_info *mtd
* cmdfunc() both expect cmd_ctrl() to be populated,
* so we need to check that that's the case
*/