diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-03 21:22:08 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-05 15:02:47 +0200 |
| commit | 1f8d9f70c259a5702c4a7646754ccad6add5d9ab (patch) | |
| tree | e7738d25b01ffb9b31f3d5f7d4c01ca1d4c699b2 /target/linux/ramips | |
| parent | d37f8a60f079d424901bc55ebd19e58505631c48 (diff) | |
| download | upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.tar.gz upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.tar.bz2 upstream-1f8d9f70c259a5702c4a7646754ccad6add5d9ab.zip | |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
Run tested: x86
Build tested: x86
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ramips')
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ramips/patches-4.14/0013-owrt-hack-fix-mt7688-cache-issue.patch b/target/linux/ramips/patches-4.14/0013-owrt-hack-fix-mt7688-cache-issue.patch index 442f3180a3..47de8a5f17 100644 --- a/target/linux/ramips/patches-4.14/0013-owrt-hack-fix-mt7688-cache-issue.patch +++ b/target/linux/ramips/patches-4.14/0013-owrt-hack-fix-mt7688-cache-issue.patch @@ -15,10 +15,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org> BOOTMEM_DEFAULT); #endif - device_tree_init(); - sparse_init(); - plat_swiotlb_setup(); -@@ -1026,6 +1025,7 @@ void __init setup_arch(char **cmdline_p) + /* + * In order to reduce the possibility of kernel panic when failed to +@@ -1036,6 +1035,7 @@ void __init setup_arch(char **cmdline_p) cpu_cache_init(); paging_init(); diff --git a/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch b/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch index d50e689110..4ef8b4917a 100644 --- a/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch +++ b/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch @@ -3590,7 +3590,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + +out: + MSG(INIT, "[NFI] mtk_nand_probe fail, err = %d!\n", err); -+ nand_release(mtd); ++ nand_release(nand_chip); + platform_set_drvdata(pdev, NULL); + kfree(host); + nand_disable_clock(); @@ -3604,7 +3604,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + struct mtd_info *mtd = host->mtd; + struct nand_chip *nand_chip = &host->nand_chip; + -+ nand_release(mtd); ++ nand_release(nand_chip); + kfree(host); + nand_disable_clock(); + diff --git a/target/linux/ramips/patches-4.14/0040-nand-hack.patch b/target/linux/ramips/patches-4.14/0040-nand-hack.patch index c906d7fa6a..040c18358c 100644 --- a/target/linux/ramips/patches-4.14/0040-nand-hack.patch +++ b/target/linux/ramips/patches-4.14/0040-nand-hack.patch @@ -38,7 +38,7 @@ --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h -@@ -885,6 +885,9 @@ struct nand_chip { +@@ -883,6 +883,9 @@ struct nand_chip { int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this); int (*erase)(struct mtd_info *mtd, int page); int (*scan_bbt)(struct mtd_info *mtd); @@ -48,7 +48,7 @@ int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip, int feature_addr, uint8_t *subfeature_para); int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip, -@@ -893,6 +896,9 @@ struct nand_chip { +@@ -891,6 +894,9 @@ struct nand_chip { int (*setup_data_interface)(struct mtd_info *mtd, int chipnr, const struct nand_data_interface *conf); |