summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2022-03-16 19:23:08 +0100
committerPetr Štetiar <ynezz@true.cz>2022-03-17 08:47:54 +0100
commit565159db573a68d5dbc2a73231dd999b5d45781b (patch)
treecdd97a176cefbf66e4f068d6e501161a8bbdf766 /target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch
parentc5c047f19bc5cd88c6fe1a0e271a8fe5df2d038a (diff)
downloadopenwrt-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/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch')
-rw-r--r--target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch b/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch
index 7d450f95f0..55bc7ec1e8 100644
--- a/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch
+++ b/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch
@@ -87,7 +87,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (!pp)
return -EINVAL;
-@@ -397,7 +399,7 @@ void nf_unregister_net_hook(struct net *
+@@ -398,7 +400,7 @@ void nf_unregister_net_hook(struct net *
struct nf_hook_entries __rcu **pp;
struct nf_hook_entries *p;