Skip to contentSkip to conversation

Patch "ipv6: release dst on error in ip6_dst_lookup_tail" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Jun 29, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ipv6: release dst on error in ip6_dst_lookup_tail

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 Mon Sep 17 00:00:00 2001

From: Willem de Bruijn <[email protected]>
Date: Sat, 18 Feb 2017 19:00:45 -0500
Subject: ipv6: release dst on error in ip6_dst_lookup_tail

From: Willem de Bruijn <[email protected]>

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.")
Cc Ben Hutchings <[email protected]>
---
 net/ipv6/ip6_output.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
net/ipv6/ip6_output.c +4 -2
@@ -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;
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/ipv6-release-dst-on-error-in-ip6_dst_lookup_tail.patch