diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-29 16:05:04 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-31 16:51:46 +0200 |
| commit | 1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a (patch) | |
| tree | f5f3c4c10dc72357c1b80593b0aa003425c84602 /target/linux/brcm47xx | |
| parent | 7228904092d9faddd9b17a3a9aa3aa41406fa890 (diff) | |
| download | upstream-1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a.tar.gz upstream-1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a.tar.bz2 upstream-1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a.zip | |
kernel: bump 4.14 to 4.14.134
Refreshed all patches.
Remove upstreamed:
- 049-v4.20-mips-remove-superfluous-check-for-linux.patch
- 303-MIPS-Fix-bounds-check-virt_addr_valid.patch
Fixes:
- CVE-2019-3846
- CVE-2019-3900
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch index 3de77b1afd..8dc8664c92 100644 --- a/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-4.14/159-cpu_fixes.patch @@ -458,7 +458,7 @@ /* --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -971,6 +971,9 @@ void build_get_pgde32(u32 **p, unsigned +@@ -976,6 +976,9 @@ void build_get_pgde32(u32 **p, unsigned uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT); uasm_i_addu(p, ptr, tmp, ptr); #else @@ -468,7 +468,7 @@ UASM_i_LA_mostly(p, ptr, pgdc); #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ -@@ -1331,6 +1334,9 @@ static void build_r4000_tlb_refill_handl +@@ -1337,6 +1340,9 @@ static void build_r4000_tlb_refill_handl #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else @@ -478,7 +478,7 @@ build_get_pgde32(&p, K0, K1); /* get pgd in K1 */ #endif -@@ -1342,6 +1348,9 @@ static void build_r4000_tlb_refill_handl +@@ -1348,6 +1354,9 @@ static void build_r4000_tlb_refill_handl build_update_entries(&p, K0, K1); build_tlb_write_entry(&p, &l, &r, tlb_random); uasm_l_leave(&l, p); @@ -488,7 +488,7 @@ uasm_i_eret(&p); /* return from trap */ } #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT -@@ -2046,6 +2055,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -2057,6 +2066,9 @@ build_r4000_tlbchange_handler_head(u32 * #ifdef CONFIG_64BIT build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */ #else @@ -498,7 +498,7 @@ build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */ #endif -@@ -2092,6 +2104,9 @@ build_r4000_tlbchange_handler_tail(u32 * +@@ -2103,6 +2115,9 @@ build_r4000_tlbchange_handler_tail(u32 * build_tlb_write_entry(p, l, r, tlb_indexed); uasm_l_leave(l, *p); build_restore_work_registers(p); |