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:25:35 -0800 |
| commit | 7c803d69b4a8b68553511614a3f034ce6b806532 (patch) | |
| tree | 0c9b73ac49e900e90fd07c99335459f34d9125f5 | |
| parent | 8b5054279ee51fd3082a0d3ec9b987548086c318 (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>
| -rw-r--r-- | include/net/ip6_fib.h | 3 | ||||
| -rw-r--r-- | net/ipv6/route.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 3b76849c190f..75a888c254e4 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -165,7 +165,8 @@ static inline void rt6_update_expires(struct rt6_info *rt0, int timeout) static inline u32 rt6_get_cookie(const struct rt6_info *rt) { - if (rt->rt6i_flags & RTF_PCPU || unlikely(rt->dst.flags & DST_NOCACHE)) + if (rt->rt6i_flags & RTF_PCPU || + (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from)) rt = (struct rt6_info *)(rt->dst.from); return rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index fcb239b6d770..8478719ef500 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1284,7 +1284,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); |