diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-10-14 13:14:57 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-10-14 17:18:54 +0200 |
commit | 7dd822983b8728772e433c7718739b741c3d6de0 (patch) | |
tree | d26ea01078299c967e01d2284dde24eb7e44a3bf /target/linux/generic/backport-4.14 | |
parent | aee081e62ef8b79f7ea18eac3e66eddcfd03e00a (diff) | |
download | upstream-7dd822983b8728772e433c7718739b741c3d6de0.tar.gz upstream-7dd822983b8728772e433c7718739b741c3d6de0.tar.bz2 upstream-7dd822983b8728772e433c7718739b741c3d6de0.zip |
kernel: bump 4.14 to 4.14.201
Refreshed all patches.
Fixes:
- CVE-2020-14386
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14')
-rw-r--r-- | target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch index 885d632d22..6390cc4f2b 100644 --- a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch +++ b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch @@ -90,7 +90,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> expired_count++; --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c -@@ -1123,6 +1123,14 @@ static const struct nla_policy ct_nla_po +@@ -1125,6 +1125,14 @@ static const struct nla_policy ct_nla_po .len = NF_CT_LABELS_MAX_SIZE }, }; @@ -105,7 +105,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static int ctnetlink_flush_conntrack(struct net *net, const struct nlattr * const cda[], u32 portid, int report) -@@ -1135,7 +1143,7 @@ static int ctnetlink_flush_conntrack(str +@@ -1137,7 +1145,7 @@ static int ctnetlink_flush_conntrack(str return PTR_ERR(filter); } @@ -114,7 +114,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> portid, report); kfree(filter); -@@ -1181,6 +1189,11 @@ static int ctnetlink_del_conntrack(struc +@@ -1183,6 +1191,11 @@ static int ctnetlink_del_conntrack(struc ct = nf_ct_tuplehash_to_ctrack(h); |