diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-03-16 19:23:08 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-03-17 08:47:54 +0100 |
| commit | 565159db573a68d5dbc2a73231dd999b5d45781b (patch) | |
| tree | cdd97a176cefbf66e4f068d6e501161a8bbdf766 /target/linux/generic/hack-4.14 | |
| parent | c5c047f19bc5cd88c6fe1a0e271a8fe5df2d038a (diff) | |
| download | upstream-565159db573a68d5dbc2a73231dd999b5d45781b.tar.gz upstream-565159db573a68d5dbc2a73231dd999b5d45781b.tar.bz2 upstream-565159db573a68d5dbc2a73231dd999b5d45781b.zip | |
kernel: bump 4.14 to 4.14.272
Added new config symbol `HARDEN_BRANCH_HISTORY` in order to harden
Spectre style attacks against branch history and fixed rejects in
following patches:
* generic/hack-4.14/220-gc_sections.patch
* generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
Other patches refreshed automagically.
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/generic/hack-4.14')
| -rw-r--r-- | target/linux/generic/hack-4.14/220-gc_sections.patch | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/target/linux/generic/hack-4.14/220-gc_sections.patch b/target/linux/generic/hack-4.14/220-gc_sections.patch index 2605d7f78f..cf493a2574 100644 --- a/target/linux/generic/hack-4.14/220-gc_sections.patch +++ b/target/linux/generic/hack-4.14/220-gc_sections.patch @@ -67,7 +67,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> # but it is being used too early to link to meaningful stack_chk logic. --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S -@@ -18,7 +18,7 @@ +@@ -31,7 +31,7 @@ #define PROC_INFO \ . = ALIGN(4); \ VMLINUX_SYMBOL(__proc_info_begin) = .; \ @@ -76,7 +76,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> VMLINUX_SYMBOL(__proc_info_end) = .; #define HYPERVISOR_TEXT \ -@@ -29,11 +29,11 @@ +@@ -42,11 +42,11 @@ #define IDMAP_TEXT \ ALIGN_FUNCTION(); \ VMLINUX_SYMBOL(__idmap_text_start) = .; \ @@ -90,7 +90,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> VMLINUX_SYMBOL(__hyp_idmap_text_end) = .; #ifdef CONFIG_HOTPLUG_CPU -@@ -106,7 +106,7 @@ SECTIONS +@@ -119,7 +119,7 @@ SECTIONS _stext = .; /* Text and read-only data */ IDMAP_TEXT __exception_text_start = .; @@ -99,7 +99,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> __exception_text_end = .; IRQENTRY_TEXT SOFTIRQENTRY_TEXT -@@ -135,7 +135,7 @@ SECTIONS +@@ -148,7 +148,7 @@ SECTIONS __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { __start___ex_table = .; #ifdef CONFIG_MMU @@ -108,7 +108,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> #endif __stop___ex_table = .; } -@@ -147,12 +147,12 @@ SECTIONS +@@ -160,12 +160,12 @@ SECTIONS . = ALIGN(8); .ARM.unwind_idx : { __start_unwind_idx = .; @@ -123,24 +123,33 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> __stop_unwind_tab = .; } #endif -@@ -172,14 +172,14 @@ SECTIONS - */ - __vectors_start = .; - .vectors 0xffff0000 : AT(__vectors_start) { -- *(.vectors) -+ KEEP(*(.vectors)) +@@ -186,13 +186,13 @@ SECTIONS + __vectors_lma = .; + OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) { + .vectors { +- *(.vectors) ++ KEEP(*(.vectors)) + } + .vectors.bhb.loop8 { +- *(.vectors.bhb.loop8) ++ KEEP(*(.vectors.bhb.loop8)) + } + .vectors.bhb.bpiall { +- *(.vectors.bhb.bpiall) ++ KEEP(*(.vectors.bhb.bpiall)) + } } - . = __vectors_start + SIZEOF(.vectors); - __vectors_end = .; + ARM_LMA(__vectors, .vectors); +@@ -204,7 +204,7 @@ SECTIONS - __stubs_start = .; - .stubs ADDR(.vectors) + 0x1000 : AT(__stubs_start) { + __stubs_lma = .; + .stubs ADDR(.vectors) + 0x1000 : AT(__stubs_lma) { - *(.stubs) + KEEP(*(.stubs)) } - . = __stubs_start + SIZEOF(.stubs); - __stubs_end = .; -@@ -195,24 +195,24 @@ SECTIONS + ARM_LMA(__stubs, .stubs); + . = __stubs_lma + SIZEOF(.stubs); +@@ -220,24 +220,24 @@ SECTIONS } .init.arch.info : { __arch_info_begin = .; |