Commit 1d4a31dd authored by David S. Miller's avatar David S. Miller
Browse files

net: Fix bus in SKB queue splicing interfaces. 



Handle the case of head being non-empty, by adding list->qlen
to head->qlen instead of using direct assignment.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b815a1a

include/linux/skbuff.h

+4 −4
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ static inline void skb_queue_splice(const struct sk_buff_head *list, 
{

	if (!skb_queue_empty(list)) {

		__skb_queue_splice(list, (struct sk_buff *) head, head->next);

		head->qlen = list->qlen;

		head->qlen += list->qlen;

	}

}
@@ -754,7 +754,7 @@ static inline void skb_queue_splice_init(struct sk_buff_head *list, 
{

	if (!skb_queue_empty(list)) {

		__skb_queue_splice(list, (struct sk_buff *) head, head->next);

		head->qlen = list->qlen;

		head->qlen += list->qlen;

		__skb_queue_head_init(list);

	}

}
@@ -769,7 +769,7 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list, 
{

	if (!skb_queue_empty(list)) {

		__skb_queue_splice(list, head->prev, (struct sk_buff *) head);

		head->qlen = list->qlen;

		head->qlen += list->qlen;

	}

}
@@ -786,7 +786,7 @@ static inline void skb_queue_splice_tail_init(struct sk_buff_head *list, 
{

	if (!skb_queue_empty(list)) {

		__skb_queue_splice(list, head->prev, (struct sk_buff *) head);

		head->qlen = list->qlen;

		head->qlen += list->qlen;

		__skb_queue_head_init(list);

	}

}