diff options
| author | Martin KaFai Lau <kafai@fb.com> | 2015-11-11 11:51:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 21:40:56 -0800 |
| commit | 4ab43ae83f90543998b1640fb2cb556ce1a604c0 (patch) | |
| tree | 511d925451f4644533d1b2a9d320c0bd7ea1b151 /net | |
| parent | dd91a7e65f8008ac989d61131670949feec08d23 (diff) | |
ipv6: Check rt->dst.from for the DST_NOCACHE route
[ Upstrem commit 02bcf4e082e4dc634409a6a6cb7def8806d6e5e6 ]
All DST_NOCACHE rt6_info used to have rt->dst.from set to
its parent.
After commit 8e3d5be73681 ("ipv6: Avoid double dst_free"),
DST_NOCACHE is also set to rt6_info which does not have
a parent (i.e. rt->dst.from is NULL).
This patch catches the rt->dst.from == NULL case.
Fixes: 8e3d5be73681 ("ipv6: Avoid double dst_free")
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index ea892c19a1ba..d3773269d6e0 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1299,7 +1299,8 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie) rt6_dst_from_metrics_check(rt); - if ((rt->rt6i_flags & RTF_PCPU) || unlikely(dst->flags & DST_NOCACHE)) + if (rt->rt6i_flags & RTF_PCPU || + (unlikely(dst->flags & DST_NOCACHE) && rt->dst.from)) return rt6_dst_from_check(rt, cookie); else return rt6_check(rt, cookie); |