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/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch | |
parent | c5c047f19bc5cd88c6fe1a0e271a8fe5df2d038a (diff) | |
download | openwrt-565159db573a68d5dbc2a73231dd999b5d45781b.tar.gz openwrt-565159db573a68d5dbc2a73231dd999b5d45781b.tar.bz2 openwrt-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/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch b/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch index 8fea44b359..30d5c5843b 100644 --- a/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch +++ b/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch @@ -13,7 +13,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/netfilter/core.c +++ b/net/netfilter/core.c -@@ -356,7 +356,7 @@ int nf_register_net_hook(struct net *net +@@ -357,7 +357,7 @@ int nf_register_net_hook(struct net *net EXPORT_SYMBOL(nf_register_net_hook); /* @@ -22,7 +22,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> * * @oldp: current address of hook blob * @unreg: hook to unregister -@@ -364,8 +364,8 @@ EXPORT_SYMBOL(nf_register_net_hook); +@@ -365,8 +365,8 @@ EXPORT_SYMBOL(nf_register_net_hook); * This cannot fail, hook unregistration must always succeed. * Therefore replace the to-be-removed hook with a dummy hook. */ @@ -33,7 +33,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> { struct nf_hook_ops **orig_ops; bool found = false; -@@ -411,7 +411,7 @@ void nf_unregister_net_hook(struct net * +@@ -412,7 +412,7 @@ void nf_unregister_net_hook(struct net * return; } |