Skip to contentSkip to conversation

ipv6: rt6_check should return NULL if 'from' is NULL

PATCH In review David Ahern 2 participants 2 messages Jul 17, 2019

Subsystems (3)
lore
Share & tools
lore

David Ahern

author maintainer
#0 lore raw

PATCH 1/1 ipv6: rt6_check should return NULL if 'from' is NULL

From: David Ahern <[email protected]>

Paul reported that l2tp sessions were broken after the commit referenced in the Fixes tag. Prior to this commit rt6_check returned NULL if the rt6_info 'from' was NULL - ie., the dst_entry was disconnected from a FIB entry. Restore that behavior.

Fixes 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")
---
 net/ipv6/route.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/route.c +1 -1
index 4d2e6b31a8d6..6fe3097b9ab7 100644
@@ -2563,7 +2563,7 @@ static struct dst_entry *rt6_check(struct rt6_info *rt,
 {
 	u32 rt_cookie = 0;
 
-	if ((from && !fib6_get_cookie_safe(from, &rt_cookie)) ||
+	if (!from || !fib6_get_cookie_safe(from, &rt_cookie) ||
 	    rt_cookie != cookie)
 		return NULL;
 
Signature · 1 line
2.11.0
maintainer
#1 lore raw

From: David Ahern <[email protected]>
Date: Wed, 17 Jul 2019 15:08:43 -0700

Quoted 11 lines

From: David Ahern <[email protected]>

Paul reported that l2tp sessions were broken after the commit referenced in the Fixes tag. Prior to this commit rt6_check returned NULL if the rt6_info 'from' was NULL - ie., the dst_entry was disconnected from a FIB entry. Restore that behavior.

Fixes 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")

Applied and queued up for -stable, thanks.