diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 00:19:51 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 19:22:23 +0200 |
| commit | f4985a22ca1b46bbfa71dec4219b7fbeca2c0023 (patch) | |
| tree | 964f8813945913a7eaba920bda6a40be30516364 /target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch | |
| parent | 73fecd36bfd2b9f92a2a20f38bdb73b4433dec3e (diff) | |
| download | upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.gz upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.tar.bz2 upstream-f4985a22ca1b46bbfa71dec4219b7fbeca2c0023.zip | |
kernel: Update kernel 4.14 to version 4.14.187
Fixes:
- CVE-2020-10757
Run tested: ath79, ipq40xx
Build tested: ath79, ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch index 4c8d6e9d37..1b75bf2a06 100644 --- a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch @@ -42,7 +42,7 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> ;---------------------------------------------------------------- --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c -@@ -437,6 +437,8 @@ static inline bool uboot_arg_invalid(uns +@@ -438,6 +438,8 @@ static inline bool uboot_arg_invalid(uns /* We always pass 0 as magic from U-boot */ #define UBOOT_MAGIC_VALUE 0 @@ -51,7 +51,7 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> void __init handle_uboot_args(void) { bool use_embedded_dtb = true; -@@ -477,7 +479,7 @@ ignore_uboot_args: +@@ -478,7 +480,7 @@ ignore_uboot_args: #endif if (use_embedded_dtb) { |