From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08F8347B40D; Tue, 16 Jun 2026 16:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628627; cv=none; b=u3lIgmigIOAhfd77Ec2cu5kqO2RKfDJax2TpvN4VMzMwaKFAZcj3iC+GWDgGD7/Duu/BBV67/hwEQQskmiNgM8OXGWGldJB0lMHTt6cr0wFinKrpe30djfRJfYmtYezwAzvwcImDNwKlUJKMpkGD13sWcpFWCrIq3BAn25DnS4I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628627; c=relaxed/simple; bh=7dtb9hEKeb6c2+/6fHISKEfN7HPwsqn+16bZOSHqYYc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YLkm3gtzENtkMZpOGwB36D+JV6/DGkifn7N3m5bJUepGFvf1CqY2qnfjK3WYcOXcprQ2UbIatbWZ/uu1iRQ1i2AUuf7lsSenXD9kPqdMdLCcZq8V9j6Jz4nOtCRrXHvkxGCBSu7eDt61C3XO7joyrutVa9EAHDbT49LIihpymKM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YL5hm4+7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YL5hm4+7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC2C41F000E9; Tue, 16 Jun 2026 16:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781628625; bh=lTYiQiTVz94oMSPFuVrtfwk5jigQe/cU8wGYRDRLsrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YL5hm4+7RbZOxPaa0mx7hyLEXjrBZpr4VVgcdZEP9GXmRv/jXubHpiNYVraBO4Ip6 02+uSax44AGpADh0VF2EMJnR3P3lhadw+C+0RRnBtr06z4/VA9VhVqJ48K3MOm1ZfL bv7adOsKCxZkRoI29m6Qf5BMqcVQxG4giixOySmc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Xin Liu , Luxing Yin , Zhengchuan Liang , Ren Wei , Steffen Klassert Subject: [PATCH 6.6 131/452] xfrm: input: hold netns during deferred transport reinjection Date: Tue, 16 Jun 2026 20:25:58 +0530 Message-ID: <20260616145124.614877504@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145117.796205997@linuxfoundation.org> References: <20260616145117.796205997@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhengchuan Liang commit c16f74dc1d75d0e2e7670076d5375deda110ebeb upstream. Transport-mode reinjection stores a struct net pointer in skb->cb and uses it later from xfrm_trans_reinject(). That pointer must stay valid until the deferred callback runs. Take a netns reference when queueing deferred reinjection work and drop it after the callback completes. Use maybe_get_net() so the queueing path does not revive a namespace that is already being torn down. This keeps the existing workqueue design and fixes the netns lifetime handling in one place for all users of xfrm_trans_queue_net(). Fixes: 7b3801927e52 ("xfrm: introduce xfrm_trans_queue_net") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Xin Liu Co-developed-by: Luxing Yin Signed-off-by: Luxing Yin Signed-off-by: Zhengchuan Liang Signed-off-by: Ren Wei Assisted-by: Codex:gpt-5.4 Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/xfrm/xfrm_input.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -760,9 +760,12 @@ static void xfrm_trans_reinject(struct w spin_unlock_bh(&trans->queue_lock); local_bh_disable(); - while ((skb = __skb_dequeue(&queue))) - XFRM_TRANS_SKB_CB(skb)->finish(XFRM_TRANS_SKB_CB(skb)->net, - NULL, skb); + while ((skb = __skb_dequeue(&queue))) { + struct net *net = XFRM_TRANS_SKB_CB(skb)->net; + + XFRM_TRANS_SKB_CB(skb)->finish(net, NULL, skb); + put_net(net); + } local_bh_enable(); } @@ -771,6 +774,7 @@ int xfrm_trans_queue_net(struct net *net struct sk_buff *)) { struct xfrm_trans_tasklet *trans; + struct net *hold_net; trans = this_cpu_ptr(&xfrm_trans_tasklet); @@ -779,8 +783,12 @@ int xfrm_trans_queue_net(struct net *net BUILD_BUG_ON(sizeof(struct xfrm_trans_cb) > sizeof(skb->cb)); + hold_net = maybe_get_net(net); + if (!hold_net) + return -ENODEV; + XFRM_TRANS_SKB_CB(skb)->finish = finish; - XFRM_TRANS_SKB_CB(skb)->net = net; + XFRM_TRANS_SKB_CB(skb)->net = hold_net; spin_lock_bh(&trans->queue_lock); __skb_queue_tail(&trans->queue, skb); spin_unlock_bh(&trans->queue_lock);