dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
David S. Miller 2005-05-03 15:30:05 -07:00 committed by David S. Miller
parent 2a0a6ebee1
commit 09e1430598
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/rtnetlink.c
View File

@ -626,14 +626,13 @@ static void rtnetlink_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 (rtnetlink_rcv_skb(skb)) {
if (skb->len) {
if (skb->len)
skb_queue_head(&sk->sk_receive_queue,
skb);
qlen++;
} else
else
kfree_skb(skb);
break;
}

2
net/decnet/netfilter/dn_rtmsg.c
View File

@ -121,7 +121,7 @@ static void dnrmg_receive_user_sk(struct sock *sk, int len)
struct sk_buff *skb;
unsigned int qlen = skb_queue_len(&sk->sk_receive_queue);
while (qlen-- && (skb = skb_dequeue(&sk->sk_receive_queue))) {
for (; qlen && (skb = skb_dequeue(&sk->sk_receive_queue)); qlen--) {
dnrmg_receive_user_skb(skb);
kfree_skb(skb);
}

7
net/xfrm/xfrm_user.c
View File

@ -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;
}