diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-04-20 15:38:00 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-21 16:06:13 -0400 |
| commit | a87b7dc9f7fa7c87cbd575361553e8e9e4ab4473 (patch) | |
| tree | 43496ce1a064a81166e64d01017bf5f03158c80a /net/ipv6 | |
| parent | net/ipv6: Move rcu_read_lock to callers of ip6_rt_cache_alloc (diff) | |
| download | linux-dev-a87b7dc9f7fa7c87cbd575361553e8e9e4ab4473.tar.xz linux-dev-a87b7dc9f7fa7c87cbd575361553e8e9e4ab4473.zip | |
net/ipv6: Move rcu locking to callers of fib6_get_cookie_safe
A later patch protects 'from' in rt6_info and this simplifies the
locking needed by it.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f8b22183b7fd..810a37ac043b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -2159,9 +2159,12 @@ static struct dst_entry *rt6_dst_from_check(struct rt6_info *rt, u32 cookie) static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie) { + struct dst_entry *dst_ret; struct rt6_info *rt; - rt = (struct rt6_info *) dst; + rt = container_of(dst, struct rt6_info, dst); + + rcu_read_lock(); /* All IPV6 dsts are created with ->obsolete set to the value * DST_OBSOLETE_FORCE_CHK which forces validation calls down @@ -2170,9 +2173,13 @@ static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie) if (rt->rt6i_flags & RTF_PCPU || (unlikely(!list_empty(&rt->rt6i_uncached)) && rt->from)) - return rt6_dst_from_check(rt, cookie); + dst_ret = rt6_dst_from_check(rt, cookie); else - return rt6_check(rt, cookie); + dst_ret = rt6_check(rt, cookie); + + rcu_read_unlock(); + + return dst_ret; } static struct dst_entry *ip6_negative_advice(struct dst_entry *dst) |