Commit 2ed13263 authored Feb 20, 2022 by Eric Dumazet Committed by Greg Kroah-Hartman Mar 02, 2022

net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends



commit ef527f968ae05c6717c39f49c8709a7e2c19183a upstream.

Whenever one of these functions pull all data from an skb in a frag_list,
use consume_skb() instead of kfree_skb() to avoid polluting drop
monitoring.

Fixes: 6fa01ccd ("skbuff: Add pskb_extract() helper function")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20220220154052.1308469-1-eric.dumazet@gmail.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 97a6c07d

net/core/skbuff.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2139,7 +2139,7 @@ void __pskb_pull_tail(struct sk_buff skb, int delta)
		/* Free pulled out fragments. */
		while ((list = skb_shinfo(skb)->frag_list) != insp) {
		skb_shinfo(skb)->frag_list = list->next;
		kfree_skb(list);
		consume_skb(list);
		}
		/* And insert new clone at head. */
		if (clone) {
		@@ -5846,7 +5846,7 @@ static int pskb_carve_frag_list(struct sk_buff *skb,
		/* Free pulled out fragments. */
		while ((list = shinfo->frag_list) != insp) {
		shinfo->frag_list = list->next;
		kfree_skb(list);
		consume_skb(list);
		}
		/* And insert new clone at head. */
		if (clone) {