aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-05-03 18:30:05 -0400
committerDavid S. Miller <davem@davemloft.net>2005-05-03 18:30:05 -0400
commit09e14305982efc2f3b509d3c50ef5dcbff64a998 (patch)
tree7829c8b212a84e793ebf2d5bd0ceb68283c7b79e /net/core
parent2a0a6ebee1d68552152ae8d4aeda91d806995dec (diff)
[NETLINK]: Fix infinite loops in synchronous netlink changes.
The qlen should continue to decrement, even if we pop partially processed SKBs back onto the receive queue. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/rtnetlink.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 6e1ab1e34b2e..75b6d33b5292 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -626,14 +626,13 @@ static void rtnetlink_rcv(struct sock *sk, int len)
626 if (qlen > skb_queue_len(&sk->sk_receive_queue)) 626 if (qlen > skb_queue_len(&sk->sk_receive_queue))
627 qlen = skb_queue_len(&sk->sk_receive_queue); 627 qlen = skb_queue_len(&sk->sk_receive_queue);
628 628
629 while (qlen--) { 629 for (; qlen; qlen--) {
630 skb = skb_dequeue(&sk->sk_receive_queue); 630 skb = skb_dequeue(&sk->sk_receive_queue);
631 if (rtnetlink_rcv_skb(skb)) { 631 if (rtnetlink_rcv_skb(skb)) {
632 if (skb->len) { 632 if (skb->len)
633 skb_queue_head(&sk->sk_receive_queue, 633 skb_queue_head(&sk->sk_receive_queue,
634 skb); 634 skb);
635 qlen++; 635 else
636 } else
637 kfree_skb(skb); 636 kfree_skb(skb);
638 break; 637 break;
639 } 638 }