Skip to contentSkip to conversation

Patch "net: ipv6: Compare lwstate in detecting duplicate nexthops" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 18, 2017

Subsystems (3)
Networking Stable branch IPv4/IPv6
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

net: ipv6: Compare lwstate in detecting duplicate nexthops

to the 4.4-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:
net-ipv6-compare-lwstate-in-detecting-duplicate-nexthops.patch
and it can be found in the queue-4.4 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 f06b7549b79e29a672336d4e134524373fb7a232 Mon Sep 17 00:00:00 2001

From: David Ahern <[email protected]>
Date: Wed, 5 Jul 2017 14:41:46 -0600
Subject: net: ipv6: Compare lwstate in detecting duplicate nexthops
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: David Ahern <[email protected]>

commit f06b7549b79e29a672336d4e134524373fb7a232 upstream.

Lennert reported a failure to add different mpls encaps in a multipath route:

  $ ip -6 route add 1234::/16 \
        nexthop encap mpls 10 via fe80::1 dev ens3 \
        nexthop encap mpls 20 via fe80::1 dev ens3
  RTNETLINK answers: File exists

The problem is that the duplicate nexthop detection does not compare lwtunnel configuration. Add it.

Fixes 19e42e451506 ("ipv6: support for fib route lwtunnel encap attributes")
Signed-off-by David Ahern <[email protected]>
Reported-by João Taveira Araújo <[email protected]>
Reported-by Lennert Buytenhek <[email protected]>
Acked-by Roopa Prabhu <[email protected]>
Tested-by Lennert Buytenhek <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 include/net/ip6_route.h |    8 ++++++++
 net/ipv6/ip6_fib.c      |    5 +----
 net/ipv6/route.c        |    8 +-------
 3 files changed, 10 insertions(+), 11 deletions(-)
include/net/ip6_route.h +8 -0
@@ -21,6 +21,7 @@ struct route_info {
 #include <net/flow.h>
 #include <net/ip6_fib.h>
 #include <net/sock.h>
+#include <net/lwtunnel.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/route.h>

@@ -208,4 +209,11 @@ static inline struct in6_addr *rt6_nexth
 		return daddr;
 }
 
+static inline bool rt6_duplicate_nexthop(struct rt6_info *a, struct rt6_info *b)
+{
+	return a->dst.dev == b->dst.dev &&
+	       a->rt6i_idev == b->rt6i_idev &&
+	       ipv6_addr_equal(&a->rt6i_gateway, &b->rt6i_gateway) &&
+	       !lwtunnel_cmp_encap(a->dst.lwtstate, b->dst.lwtstate);
+}
 #endif
net/ipv6/ip6_fib.c +1 -4
@@ -767,10 +767,7 @@ static int fib6_add_rt2node(struct fib6_
 				goto next_iter;
 			}
 
-			if (iter->dst.dev == rt->dst.dev &&
-			    iter->rt6i_idev == rt->rt6i_idev &&
-			    ipv6_addr_equal(&iter->rt6i_gateway,
-					    &rt->rt6i_gateway)) {
+			if (rt6_duplicate_nexthop(iter, rt)) {
 				if (rt->rt6i_nsiblings)
 					rt->rt6i_nsiblings = 0;
 				if (!(iter->rt6i_flags & RTF_EXPIRES))
net/ipv6/route.c +1 -7
@@ -2833,17 +2833,11 @@ static int ip6_route_info_append(struct
 				 struct rt6_info *rt, struct fib6_config *r_cfg)
 {
 	struct rt6_nh *nh;
-	struct rt6_info *rtnh;
 	int err = -EEXIST;
 
 	list_for_each_entry(nh, rt6_nh_list, next) {
 		/* check if rt6_info already exists */
-		rtnh = nh->rt6_info;
-
-		if (rtnh->dst.dev == rt->dst.dev &&
-		    rtnh->rt6i_idev == rt->rt6i_idev &&
-		    ipv6_addr_equal(&rtnh->rt6i_gateway,
-				    &rt->rt6i_gateway))
+		if (rt6_duplicate_nexthop(nh->rt6_info, rt))
 			return err;
 	}

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

queue-4.4/vrf-fix-bug_on-triggered-by-rx-when-destroying-a-vrf.patch queue-4.4/ipv6-avoid-unregistering-inet6_dev-for-loopback.patch queue-4.4/net-ipv6-compare-lwstate-in-detecting-duplicate-nexthops.patch