From: Eric Dumazet <edumazet@google.com>
Date: Thu, 6 Nov 2025 20:29:33 +0000 (+0000)
Subject: net: allow skb_release_head_state() to be called multiple times
X-Git-Tag: v6.19-rc1~170^2~205^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fcf572211da626982223ab4e4641bcd92db0701;p=thirdparty%2Fkernel%2Flinux.git

net: allow skb_release_head_state() to be called multiple times

Currently, only skb dst is cleared (thanks to skb_dst_drop())

Make sure skb->destructor, conntrack and extensions are cleared.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://patch.msgid.link/20251106202935.1776179-2-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5b4bc8b1c7d56..eeddb9e737ff2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1149,11 +1149,10 @@ void skb_release_head_state(struct sk_buff *skb)
 				skb);
 
 #endif
+		skb->destructor = NULL;
 	}
-#if IS_ENABLED(CONFIG_NF_CONNTRACK)
-	nf_conntrack_put(skb_nfct(skb));
-#endif
-	skb_ext_put(skb);
+	nf_reset_ct(skb);
+	skb_ext_reset(skb);
 }
 
 /* Free everything but the sk_buff shell. */