diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-04-23 09:24:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-24 11:46:54 -0700 |
| commit | 4109a2c3b91e5f38e401fc4ea56848e65e429785 (patch) | |
| tree | 5926a946b170e83fa231881157cfa66d6d6f8723 /net/tipc | |
| parent | a65120bae4b7425a39c5783aa3d4fc29677eef0e (diff) | |
| download | linux-stable-4109a2c3b91e5f38e401fc4ea56848e65e429785.tar.gz linux-stable-4109a2c3b91e5f38e401fc4ea56848e65e429785.tar.bz2 linux-stable-4109a2c3b91e5f38e401fc4ea56848e65e429785.zip | |
tipc: tipc_udp_recv() cleanup vs rcu verbs
First thing tipc_udp_recv() does is to use rcu_dereference_sk_user_data(),
and this is really hinting we already own rcu_read_lock() from the caller
(UDP stack).
No need to add another rcu_read_lock()/rcu_read_unlock() pair.
Also use rcu_dereference() instead of rcu_dereference_rtnl()
in the data path.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/udp_media.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 6f166fbbfff1..7413cbc9b638 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -354,10 +354,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb) skb_pull(skb, sizeof(struct udphdr)); hdr = buf_msg(skb); - rcu_read_lock(); - b = rcu_dereference_rtnl(ub->bearer); + b = rcu_dereference(ub->bearer); if (!b) - goto rcu_out; + goto out; if (b && test_bit(0, &b->up)) { tipc_rcv(sock_net(sk), skb, b); @@ -368,11 +367,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb) if (unlikely(msg_user(hdr) == LINK_CONFIG)) { err = tipc_udp_rcast_disc(b, skb); if (err) - goto rcu_out; + goto out; } -rcu_out: - rcu_read_unlock(); out: kfree_skb(skb); return 0; |