diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-08-11 19:30:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-12 02:55:28 -0700 |
| commit | 33d480ce6d43326e2541fd79b3548858a174ec3c (patch) | |
| tree | c938ee8c07a2e0f33178069b55439a54188f38fa /net/ipv4/ipmr.c | |
| parent | cd28ca0a3dd17c68d24b839602a0e6268ad28b5d (diff) | |
| download | op-kernel-dev-33d480ce6d43326e2541fd79b3548858a174ec3c.zip op-kernel-dev-33d480ce6d43326e2541fd79b3548858a174ec3c.tar.gz | |
net: cleanup some rcu_dereference_raw
RCU api had been completed and rcu_access_pointer() or
rcu_dereference_protected() are better than generic
rcu_dereference_raw()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index f550285..6164e98 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1203,7 +1203,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi return -ENOENT; if (optname != MRT_INIT) { - if (sk != rcu_dereference_raw(mrt->mroute_sk) && + if (sk != rcu_access_pointer(mrt->mroute_sk) && !capable(CAP_NET_ADMIN)) return -EACCES; } @@ -1230,7 +1230,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi rtnl_unlock(); return ret; case MRT_DONE: - if (sk != rcu_dereference_raw(mrt->mroute_sk)) + if (sk != rcu_access_pointer(mrt->mroute_sk)) return -EACCES; return ip_ra_control(sk, 0, NULL); case MRT_ADD_VIF: |
