From 2d02a4f5bda4a5ff392286360ec7d1129bd77d25 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 17 Aug 2017 10:51:05 +0200 Subject: 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 --- .../pending-4.9/411-mtd-partial_eraseblock_write.patch | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch') diff --git a/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch index 307445fffa..6c03a29842 100644 --- a/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch +++ b/target/linux/generic/pending-4.9/411-mtd-partial_eraseblock_write.patch @@ -8,8 +8,6 @@ Signed-off-by: Felix Fietkau include/linux/mtd/mtd.h | 4 +++ 2 files changed, 85 insertions(+), 9 deletions(-) -diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c -index fce83882fd4e..0238b0babe2f 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -36,6 +36,8 @@ @@ -21,7 +19,7 @@ index fce83882fd4e..0238b0babe2f 100644 /* Our partition linked list */ static LIST_HEAD(mtd_partitions); static DEFINE_MUTEX(mtd_partitions_mutex); -@@ -241,13 +243,61 @@ static int part_erase(struct mtd_info *mtd, struct erase_info *instr) +@@ -241,13 +243,61 @@ static int part_erase(struct mtd_info *m struct mtd_part *part = mtd_to_part(mtd); int ret; @@ -83,7 +81,7 @@ index fce83882fd4e..0238b0babe2f 100644 return ret; } -@@ -255,6 +305,25 @@ void mtd_erase_callback(struct erase_info *instr) +@@ -255,6 +305,25 @@ void mtd_erase_callback(struct erase_inf { if (instr->mtd->_erase == part_erase) { struct mtd_part *part = mtd_to_part(instr->mtd); @@ -109,7 +107,7 @@ index fce83882fd4e..0238b0babe2f 100644 if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) instr->fail_addr -= part->offset; -@@ -590,19 +659,22 @@ static struct mtd_part *allocate_partition(struct mtd_info *parent, +@@ -590,19 +659,22 @@ static struct mtd_part *allocate_partiti remainder = do_div(tmp, wr_alignment); if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) { /* Doesn't start on a boundary of major erase size */ @@ -141,8 +139,6 @@ index fce83882fd4e..0238b0babe2f 100644 } mtd_set_ooblayout(&slave->mtd, &part_ooblayout_ops); -diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h -index e7d5091bb447..0db85491f085 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -55,6 +55,10 @@ struct erase_info { @@ -156,6 +152,3 @@ index e7d5091bb447..0db85491f085 100644 }; struct mtd_erase_region_info { --- -2.11.0 - -- cgit v1.2.3