From c5923c011cd546f8e2400f44bbad2b3afc72f535 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 18 Jun 2017 02:36:32 +0100 Subject: [PATCH] net: add kfree_skb_list() Extracted from upstream commit bd8a7036c06c "gre: fix a possible skb leak". This patch adds a kfree_skb_list() helper. Signed-off-by: Ben Hutchings --- include/linux/skbuff.h | 1 + net/core/skbuff.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 2af31eb76bd0..42e067bb16c8 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -534,6 +534,7 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb) } extern void kfree_skb(struct sk_buff *skb); +extern void kfree_skb_list(struct sk_buff *segs); extern void consume_skb(struct sk_buff *skb); extern void __kfree_skb(struct sk_buff *skb); extern struct sk_buff *__alloc_skb(unsigned int size, diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b30d9c2fd5bd..847b314b3a70 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -277,15 +277,8 @@ EXPORT_SYMBOL(dev_alloc_skb); static void skb_drop_list(struct sk_buff **listp) { - struct sk_buff *list = *listp; - + kfree_skb_list(*listp); *listp = NULL; - - do { - struct sk_buff *this = list; - list = list->next; - kfree_skb(this); - } while (list); } static inline void skb_drop_fraglist(struct sk_buff *skb) @@ -436,6 +429,17 @@ void kfree_skb(struct sk_buff *skb) } EXPORT_SYMBOL(kfree_skb); +void kfree_skb_list(struct sk_buff *segs) +{ + while (segs) { + struct sk_buff *next = segs->next; + + kfree_skb(segs); + segs = next; + } +} +EXPORT_SYMBOL(kfree_skb_list); + /** * consume_skb - free an skbuff * @skb: buffer to free -- 2.39.2