aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-04-16 00:00:49 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-04-16 00:22:57 +0300
commitec1d7b94616c392c28b8a51f1aa0c481cc6d92c8 (patch)
treef25b8ee10186d5d2677d9ad48108ae3768e3914f /target/linux/generic/backport-4.14
parent03774d28e1c12f24857cdb44a110df593cec42a6 (diff)
downloadupstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.gz
upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.bz2
upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.zip
kernel: bump 4.14 to 4.14.34
Refresh patches. Update patches that no longer apply: - backport/313-netfilter-remove-defensive-check-on-malformed-packet.patch - pending/642-net-8021q-support-hardware-flow-table-offload.patch Compile-tested: x86/64. Runtime-tested: x86/64. Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/backport-4.14')
-rw-r--r--target/linux/generic/backport-4.14/313-netfilter-remove-defensive-check-on-malformed-packet.patch6
-rw-r--r--target/linux/generic/backport-4.14/324-netfilter-flow-table-support-for-IPv6.patch4
-rw-r--r--target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch2
-rw-r--r--target/linux/generic/backport-4.14/350-ipv6-make-ip6_dst_mtu_forward-inline.patch2
4 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/backport-4.14/313-netfilter-remove-defensive-check-on-malformed-packet.patch b/target/linux/generic/backport-4.14/313-netfilter-remove-defensive-check-on-malformed-packet.patch
index 30b0bc70dd..5e56d0dc49 100644
--- a/target/linux/generic/backport-4.14/313-netfilter-remove-defensive-check-on-malformed-packet.patch
+++ b/target/linux/generic/backport-4.14/313-netfilter-remove-defensive-check-on-malformed-packet.patch
@@ -87,9 +87,9 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
- ip_hdrlen(skb) < sizeof(struct iphdr))
- return NF_ACCEPT;
-
- if (ip_is_fragment(ip_hdr(skb))) /* IP_NODEFRAG setsockopt set */
- return NF_ACCEPT;
-
+ if (ip_is_fragment(ip_hdr(skb))) { /* IP_NODEFRAG setsockopt set */
+ enum ip_conntrack_info ctinfo;
+ struct nf_conn *tmpl;
--- a/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
@@ -355,11 +355,6 @@ nf_nat_ipv4_out(void *priv, struct sk_bu
diff --git a/target/linux/generic/backport-4.14/324-netfilter-flow-table-support-for-IPv6.patch b/target/linux/generic/backport-4.14/324-netfilter-flow-table-support-for-IPv6.patch
index a5bbac44f3..abe7ef0092 100644
--- a/target/linux/generic/backport-4.14/324-netfilter-flow-table-support-for-IPv6.patch
+++ b/target/linux/generic/backport-4.14/324-netfilter-flow-table-support-for-IPv6.patch
@@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
-@@ -370,7 +370,7 @@ static inline int ip6_forward_finish(str
+@@ -383,7 +383,7 @@ static inline int ip6_forward_finish(str
return dst_output(net, sk, skb);
}
@@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
{
unsigned int mtu;
struct inet6_dev *idev;
-@@ -390,6 +390,7 @@ static unsigned int ip6_dst_mtu_forward(
+@@ -403,6 +403,7 @@ static unsigned int ip6_dst_mtu_forward(
return mtu;
}
diff --git a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
index 8a2dbd8d5e..92d7942d86 100644
--- a/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
+++ b/target/linux/generic/backport-4.14/336-netfilter-exit_net-cleanup-check-added.patch
@@ -80,7 +80,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
static void nfnl_queue_net_exit_batch(struct list_head *net_exit_list)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
-@@ -1719,8 +1719,17 @@ static int __net_init xt_net_init(struct
+@@ -1754,8 +1754,17 @@ static int __net_init xt_net_init(struct
return 0;
}
diff --git a/target/linux/generic/backport-4.14/350-ipv6-make-ip6_dst_mtu_forward-inline.patch b/target/linux/generic/backport-4.14/350-ipv6-make-ip6_dst_mtu_forward-inline.patch
index 3a0275bd37..e16f13ac45 100644
--- a/target/linux/generic/backport-4.14/350-ipv6-make-ip6_dst_mtu_forward-inline.patch
+++ b/target/linux/generic/backport-4.14/350-ipv6-make-ip6_dst_mtu_forward-inline.patch
@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
-@@ -370,28 +370,6 @@ static inline int ip6_forward_finish(str
+@@ -383,28 +383,6 @@ static inline int ip6_forward_finish(str
return dst_output(net, sk, skb);
}