3.18-stable patches

added patches:
	ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch

diff --git a/queue-3.18/ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch b/queue-3.18/ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch
new file mode 100644 (file)
index 0000000..ccdfbb5
--- /dev/null
+++ b/queue-3.18/ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch
@@ -0,0 +1,38 @@
+From 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 Mon Sep 17 00:00:00 2001
+From: Willem de Bruijn <willemb@google.com>
+Date: Sat, 18 Feb 2017 19:00:45 -0500
+Subject: ipv6: release dst on error in ip6_dst_lookup_tail
+
+From: Willem de Bruijn <willemb@google.com>
+
+commit 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 upstream.
+
+If ip6_dst_lookup_tail has acquired a dst and fails the IPv4-mapped
+check, release the dst before returning an error.
+
+Fixes: ec5e3b0a1d41 ("ipv6: Inhibit IPv4-mapped src address on the wire.")
+Signed-off-by: Willem de Bruijn <willemb@google.com>
+Acked-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ipv6/ip6_output.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -961,8 +961,10 @@ static int ip6_dst_lookup_tail(struct so
+       }
+ #endif
+       if (ipv6_addr_v4mapped(&fl6->saddr) &&
+-          !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr)))
+-              return -EAFNOSUPPORT;
++          !(ipv6_addr_v4mapped(&fl6->daddr) || ipv6_addr_any(&fl6->daddr))) {
++              err = -EAFNOSUPPORT;
++              goto out_err_release;
++      }
+ 
+       return 0;
+ 

diff --git a/queue-3.18/series b/queue-3.18/series
index 37db7bb213817d618c88e115016d7cc72a1455de..e6f2c1c06be07c07772b7165a62e56122a90d7b8 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1 +1,2 @@
 xhci-fix-deadlock-at-host-remove-by-running-watchdog-correctly.patch
+ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch

diff --git a/queue-4.11/series b/queue-4.11/series
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644 (file)
index 0000000..035e36a
--- /dev/null
+++ b/queue-4.4/series
@@ -0,0 +1 @@
+ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch

diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644 (file)
index 0000000..035e36a
--- /dev/null
+++ b/queue-4.9/series
@@ -0,0 +1 @@
+ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch