: Fix bug in skb list splicing.
Subsystems (2)
David Miller
maintainerPATCH 1/1 : Fix bug in skb list splicing.
We don't update the qlen correctly when 'head' is
non-empty.
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 David S. Miller <[email protected]>
--- include/linux/skbuff.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
include/linux/skbuff.h +4 -4
@@ -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); } }
Signature · 1 line
1.5.6.5