diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-03 21:46:40 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-05 15:02:47 +0200 |
| commit | 0f07496f520cef7c58efe125d542cbc063bbc558 (patch) | |
| tree | 8ef66ba2f34a3d081c788fa21d79b602f45f33f0 /target/linux/brcm2708/patches-4.9 | |
| parent | 1f8d9f70c259a5702c4a7646754ccad6add5d9ab (diff) | |
| download | upstream-0f07496f520cef7c58efe125d542cbc063bbc558.tar.gz upstream-0f07496f520cef7c58efe125d542cbc063bbc558.tar.bz2 upstream-0f07496f520cef7c58efe125d542cbc063bbc558.zip | |
kernel: Update kernel 4.9 to version 4.9.229
Fixes:
- CVE-2020-10757
Run tested: ar71xx
Build tested: ar71xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9')
| -rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch | 2 | ||||
| -rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0044-Add-SMI-NAND-driver.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch b/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch index 37bcc65ed5..28f337b0e3 100644 --- a/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch +++ b/target/linux/brcm2708/patches-4.9/950-0028-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch @@ -9,7 +9,7 @@ Subject: [PATCH] kbuild: Ignore dtco targets when filtering symbols --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include -@@ -294,7 +294,7 @@ ksym_dep_filter = +@@ -295,7 +295,7 @@ ksym_dep_filter = $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ as_*_S|cpp_s_S) \ $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ diff --git a/target/linux/brcm2708/patches-4.9/950-0044-Add-SMI-NAND-driver.patch b/target/linux/brcm2708/patches-4.9/950-0044-Add-SMI-NAND-driver.patch index ec6010a296..8e1d09880e 100644 --- a/target/linux/brcm2708/patches-4.9/950-0044-Add-SMI-NAND-driver.patch +++ b/target/linux/brcm2708/patches-4.9/950-0044-Add-SMI-NAND-driver.patch @@ -312,7 +312,7 @@ Signed-off-by: Luke Wren <wren6991@gmail.com> + if (!ret) + return 0; + -+ nand_release(mtd); ++ nand_release(this); + return -EINVAL; +} + @@ -320,7 +320,7 @@ Signed-off-by: Luke Wren <wren6991@gmail.com> +{ + struct bcm2835_smi_nand_host *host = platform_get_drvdata(pdev); + -+ nand_release(&host->mtd); ++ nand_release(&host->nand_chip); + + return 0; +} |