Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-10 14:13:58 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-16 08:28:01 +0200
commit3267ee61a869f8cb830853c50bba45da79b65f7a (patch)
tree0df38c588b8ab49b0e943b0379a4fbfad780a46a
parentec25ed4a505c491f1859b62f9c18d5b17b285638 (diff)
dccp: do not use ipv6 header for ipv4 flow
(networking-stable-19_03_28).
-rw-r--r--patches.suse/dccp-do-not-use-ipv6-header-for-ipv4-flow.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.suse/dccp-do-not-use-ipv6-header-for-ipv4-flow.patch b/patches.suse/dccp-do-not-use-ipv6-header-for-ipv4-flow.patch
new file mode 100644
index 0000000000..1affb168a2
--- /dev/null
+++ b/patches.suse/dccp-do-not-use-ipv6-header-for-ipv4-flow.patch
@@ -0,0 +1,37 @@
+From: Eric Dumazet <edumazet@google.com>
+Date: Tue, 19 Mar 2019 05:46:18 -0700
+Subject: dccp: do not use ipv6 header for ipv4 flow
+Git-commit: e0aa67709f89d08c8d8e5bdd9e0b649df61d0090
+Patch-mainline: v5.1-rc3
+References: networking-stable-19_03_28
+
+When a dual stack dccp listener accepts an ipv4 flow,
+it should not attempt to use an ipv6 header or
+inet6_iif() helper.
+
+Fixes: 3df80d9320bc ("[DCCP]: Introduce DCCPv6")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ net/dccp/ipv6.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
+index d5740bad5b18..57d84e9b7b6f 100644
+--- a/net/dccp/ipv6.c
++++ b/net/dccp/ipv6.c
+@@ -436,8 +436,8 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk,
+ newnp->ipv6_mc_list = NULL;
+ newnp->ipv6_ac_list = NULL;
+ newnp->ipv6_fl_list = NULL;
+- newnp->mcast_oif = inet6_iif(skb);
+- newnp->mcast_hops = ipv6_hdr(skb)->hop_limit;
++ newnp->mcast_oif = inet_iif(skb);
++ newnp->mcast_hops = ip_hdr(skb)->ttl;
+
+ /*
+ * No need to charge this sock to the relevant IPv6 refcnt debug socks count
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index 65a8da30b1..0519a0a447 100644
--- a/series.conf
+++ b/series.conf
@@ -21588,6 +21588,7 @@
patches.drivers/mISDN-hfcpci-Test-both-vendor-device-ID-for-Digium-H.patch
patches.suse/net-stmmac-fix-memory-corruption-with-large-MTUs.patch
patches.suse/tcp-do-not-use-ipv6-header-for-ipv4-flow.patch
+ patches.suse/dccp-do-not-use-ipv6-header-for-ipv4-flow.patch
patches.suse/net-packet-Set-__GFP_NOWARN-upon-allocation-in-alloc.patch
patches.fixes/0001-netfilter-bridge-set-skb-transport_header-before-ent.patch
patches.fixes/rhashtable-Still-do-rehash-when-we-get-EEXIST.patch