Commit 49d05fe2 authored by David Ahern's avatar David Ahern Committed by David S. Miller

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

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: 93531c67 ("net/ipv6: separate handling of FIB entries from dst based routes")
Reported-by: default avatarPaul Donohue <linux-kernel@PaulSD.com>
Tested-by: default avatarPaul Donohue <linux-kernel@PaulSD.com>
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 866e5fd8
...@@ -2563,7 +2563,7 @@ static struct dst_entry *rt6_check(struct rt6_info *rt, ...@@ -2563,7 +2563,7 @@ static struct dst_entry *rt6_check(struct rt6_info *rt,
{ {
u32 rt_cookie = 0; 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) rt_cookie != cookie)
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment