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 D54075A411B; Mon, 31 Aug 2026 13:52:11 +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=1788184333; cv=none; b=bVw2hF7musf01hwbf4RCxvDw4t+t4SITk58VCD74KTmDHz2Erctc70l177D4xdY5O02DvTsjN4ofYZe4hrTeTgdYTMFEUtmE6c2l3xUy/Q3cYmJEiCOworvv2xke2dywCB6FD34PRr3IqXrTlQLeLkeYEozbhv3e1kF4OOcuObY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788184333; c=relaxed/simple; bh=E6xuzfnTI1T3wBd9nQhrKBXC/+iUjTIeomDLw1eXN3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NDy34K20rhZuTSLNcjN8l73xA2mLt3ngwRxF8KTXds4unpdDRYxhIQOgqJw51eaC3TOzIjCq9V3JiW2P2RUzApOwo4dgFOlgyth5vpa76ILPMGh2PMDihsj9Ce5VbBQ6PnInFpzgqPuCalJnLdbrU/Z6EG5M66oycctW+3GdJLQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fCImUp0r; 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="fCImUp0r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BD3F1F00A3D; Mon, 31 Aug 2026 13:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788184331; bh=HX6lSP8HJsNPqlQrfVD1nv6x+23yMEQoqiDYOUSMwlk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fCImUp0rCjIywjby6WJE0aaA8YrfO7vPr8JRWgIGvsrZlALpqLWyQV6R9FC5ky+5N A3GiUY7XednY6dux4j+Kkcc7W8KGNOlSTjaob1BOOVMGq9aV2ZMIjBli0eTAfpJBCO Jt81v5w6RUwwjnT7M1P4Er7NBu74gUgZSputSLkM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, zdi-disclosures@trendmicro.com, Sabrina Dubroca , Breno Leitao , Steffen Klassert Subject: [PATCH 6.12 71/99] xfrm: espintcp: fix UAF during close Date: Mon, 31 Aug 2026 15:34:40 +0200 Message-ID: <20260831133403.521085213@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260831133359.740409777@linuxfoundation.org> References: <20260831133359.740409777@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sabrina Dubroca commit deb232e884877bf10b4ce2580909eedec986c284 upstream. ZDI reported and analyzed a race condition during close for espintcp sockets: espintcp_close() frees emsg->skb via kfree_skb() without holding any socket lock. Concurrently, the xfrm_trans_reinject work queue invokes esp_output_tcp_finish() -> espintcp_push_skb() -> espintcp_push_msgs() -> skb_send_sock_locked(), which reads the same skb as a data source. Fix this by adding a synchronize_rcu() call after resetting sk_prot, since esp_output_tcp_finish() runs under RCU and won't use a socket with sk_prot == &tcp_prot. Simply taking the socket lock in espintcp_close() could lead to leaks, if esp_output_tcp_finish() re-adds an skb in the slot we just freed. After this, the existing barrier() is no longer needed. Cc: stable@vger.kernel.org Fixes: e27cca96cd68 ("xfrm: add espintcp (RFC 8229)") Reported-by: zdi-disclosures@trendmicro.com Signed-off-by: Sabrina Dubroca Reviewed-by: Breno Leitao Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/xfrm/espintcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -518,7 +518,8 @@ static void espintcp_close(struct sock * strp_stop(&ctx->strp); sk->sk_prot = &tcp_prot; - barrier(); + + synchronize_rcu(); disable_work_sync(&ctx->work); strp_done(&ctx->strp);