diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 00:54:41 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
| commit | ce958dd88a7e74cd7aa7c345c97c79556bc2d926 (patch) | |
| tree | 2a92f6397265cca8137812de80713ea1171287a6 /target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch | |
| parent | 78b632134f1597e4cc6498a7bb913c4f9b036caf (diff) | |
| download | upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.gz upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.bz2 upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.zip | |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was
backported which needed some adaptations to other code.
Build tested: ramips
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 3c6a59b863..3b82347dbb 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(); + |