diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-05-03 18:30:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-05-03 18:30:05 -0400 |
commit | 09e14305982efc2f3b509d3c50ef5dcbff64a998 (patch) | |
tree | 7829c8b212a84e793ebf2d5bd0ceb68283c7b79e /net/xfrm | |
parent | 2a0a6ebee1d68552152ae8d4aeda91d806995dec (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/xfrm')
-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 dab112f1dd8a..e8740a4a1d78 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) | |||
1018 | if (qlen > skb_queue_len(&sk->sk_receive_queue)) | 1018 | if (qlen > skb_queue_len(&sk->sk_receive_queue)) |
1019 | qlen = skb_queue_len(&sk->sk_receive_queue); | 1019 | qlen = skb_queue_len(&sk->sk_receive_queue); |
1020 | 1020 | ||
1021 | while (qlen--) { | 1021 | for (; qlen; qlen--) { |
1022 | skb = skb_dequeue(&sk->sk_receive_queue); | 1022 | skb = skb_dequeue(&sk->sk_receive_queue); |
1023 | if (xfrm_user_rcv_skb(skb)) { | 1023 | if (xfrm_user_rcv_skb(skb)) { |
1024 | if (skb->len) { | 1024 | if (skb->len) |
1025 | skb_queue_head(&sk->sk_receive_queue, | 1025 | skb_queue_head(&sk->sk_receive_queue, |
1026 | skb); | 1026 | skb); |
1027 | qlen++; | 1027 | else |
1028 | } else | ||
1029 | kfree_skb(skb); | 1028 | kfree_skb(skb); |
1030 | break; | 1029 | break; |
1031 | } | 1030 | } |