diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-05-03 15:30:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-05-03 15:30:05 -0700 |
| commit | 09e14305982efc2f3b509d3c50ef5dcbff64a998 (patch) | |
| tree | 7829c8b212a84e793ebf2d5bd0ceb68283c7b79e /net/xfrm/xfrm_user.c | |
| parent | 2a0a6ebee1d68552152ae8d4aeda91d806995dec (diff) | |
| download | op-kernel-dev-09e14305982efc2f3b509d3c50ef5dcbff64a998.zip op-kernel-dev-09e14305982efc2f3b509d3c50ef5dcbff64a998.tar.gz | |
[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/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index dab112f..e8740a4 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1018,14 +1018,13 @@ static void xfrm_netlink_rcv(struct sock *sk, int len) if (qlen > skb_queue_len(&sk->sk_receive_queue)) qlen = skb_queue_len(&sk->sk_receive_queue); - while (qlen--) { + for (; qlen; qlen--) { skb = skb_dequeue(&sk->sk_receive_queue); if (xfrm_user_rcv_skb(skb)) { - if (skb->len) { + if (skb->len) skb_queue_head(&sk->sk_receive_queue, skb); - qlen++; - } else + else kfree_skb(skb); break; } |
