diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-05-04 14:53:34 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-04 21:05:21 +0200 |
| commit | f9ef0c570550c9cbda3f28522753472d0d048378 (patch) | |
| tree | f5ddd3755b9e36df6cd32e6858f0cf9eb9f549ff /target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch | |
| parent | 2df0ea042d14dbfc2735b843eb82a0ae0d8bec19 (diff) | |
| download | upstream-f9ef0c570550c9cbda3f28522753472d0d048378.tar.gz upstream-f9ef0c570550c9cbda3f28522753472d0d048378.tar.bz2 upstream-f9ef0c570550c9cbda3f28522753472d0d048378.zip | |
kernel: bump 4.14 to 4.14.178
Refreshed all patches and removed upstreamed:
oxnas/001-irqchip-versatile-fpga-Handle-chained-IRQs-properly.patch
oxnas/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch
Fixes: CVE-2020-12114 and CVE-2020-11669
Runtime-tested on: qemu-x86-64
Compile-tested on: ath79/generic, x86/64, imx6
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch index 5a6eb77d0f..9a367c2ab0 100644 --- a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1928,7 +1933,6 @@ static int __xipram do_write_buffer(stru +@@ -1932,7 +1937,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -2003,6 +2007,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -2007,6 +2011,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } |