diff options
| author | Erik Hugne <erik.hugne@ericsson.com> | 2014-12-03 16:58:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 13:41:54 -0500 |
| commit | 4988bb4a3f0b3b0273c21c6c52f2730f55693b42 (patch) | |
| tree | 9668bf234d3b190d8010b353e54521d39f8a2d02 /net/tipc | |
| parent | d9a28c5b4c9a69f3036743bed36902b45dd39f1d (diff) | |
| download | linux-4988bb4a3f0b3b0273c21c6c52f2730f55693b42.tar.gz linux-4988bb4a3f0b3b0273c21c6c52f2730f55693b42.tar.bz2 linux-4988bb4a3f0b3b0273c21c6c52f2730f55693b42.zip | |
tipc: fix missing spinlock init and nullptr oops
commit 908344cdda80 ("tipc: fix bug in multicast congestion
handling") introduced two bugs with the bclink wakeup
function. This commit fixes the missing spinlock init for the
waiting_sks list. We also eliminate the race condition
between the waiting_sks length check/dequeue operations in
tipc_bclink_wakeup_users by simply removing the redundant
length check.
Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Acked-by: Tero Aho <Tero.Aho@coriant.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/bcast.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index f0761c771734..96ceefeb9daf 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -233,8 +233,11 @@ static void bclink_retransmit_pkt(u32 after, u32 to) */ void tipc_bclink_wakeup_users(void) { - while (skb_queue_len(&bclink->link.waiting_sks)) - tipc_sk_rcv(skb_dequeue(&bclink->link.waiting_sks)); + struct sk_buff *skb; + + while ((skb = skb_dequeue(&bclink->link.waiting_sks))) + tipc_sk_rcv(skb); + } /** @@ -950,7 +953,7 @@ int tipc_bclink_init(void) spin_lock_init(&bclink->lock); __skb_queue_head_init(&bcl->outqueue); __skb_queue_head_init(&bcl->deferred_queue); - __skb_queue_head_init(&bcl->waiting_sks); + skb_queue_head_init(&bcl->waiting_sks); bcl->next_out_no = 1; spin_lock_init(&bclink->node.lock); __skb_queue_head_init(&bclink->node.waiting_sks); |