aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/udp_media.c9
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)
354 skb_pull(skb, sizeof(struct udphdr)); 354 skb_pull(skb, sizeof(struct udphdr));
355 hdr = buf_msg(skb); 355 hdr = buf_msg(skb);
356 356
357 rcu_read_lock(); 357 b = rcu_dereference(ub->bearer);
358 b = rcu_dereference_rtnl(ub->bearer);
359 if (!b) 358 if (!b)
360 goto rcu_out; 359 goto out;
361 360
362 if (b && test_bit(0, &b->up)) { 361 if (b && test_bit(0, &b->up)) {
363 tipc_rcv(sock_net(sk), skb, b); 362 tipc_rcv(sock_net(sk), skb, b);
@@ -368,11 +367,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb)
368 if (unlikely(msg_user(hdr) == LINK_CONFIG)) { 367 if (unlikely(msg_user(hdr) == LINK_CONFIG)) {
369 err = tipc_udp_rcast_disc(b, skb); 368 err = tipc_udp_rcast_disc(b, skb);
370 if (err) 369 if (err)
371 goto rcu_out; 370 goto out;
372 } 371 }
373 372
374rcu_out:
375 rcu_read_unlock();
376out: 373out:
377 kfree_skb(skb); 374 kfree_skb(skb);
378 return 0; 375 return 0;