Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058972; b=lUbuJ5nRc66ntuSOKN1AizOe/gEpJHyKEHRS6T0mVWqNWoZxyU1JirOPP1vWPA6cdEcS r595YTiy1IE1Z/DXPqj4Y5IJego5DJ0UFhz+b3iCr/7dpWV7tNQByN7toq22kfcQ6VfC6 mnF/IFucjNbkcyFZ+jUzd3La4D3ODfigWsAQBTlcEJQlXs9ECu5ba1AzbApwodNuDWjHL Y/Ayum7pwRg6Rj/BxpIbs3lUSmfD8Qyg2E92gigcE9JPjp3Y0e0tRj/H3Gf4tjS0wPJZ8 FMkSj74TAdHPeXn5tZtCNK8wYS/51HNjMTmOT3kWphdhge2fXMZ1dkorD7hReQUSeWQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058972; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=g7qUltljiPo+F2ru09crKPF1bOUC9kCo0TOjeYFw6PE=; b=b4ub7YJ41Nw0bEEcmSmc67xvWpTcIVA2sFjbBMDjFi21ThFRMrTZh6v97U/yXGqjP78H dIz5OdbU8MIwL0/hznshd0Sh1TZTmocRunbHj54HMiP+3PJibrOzmUD88vkLlVqsb5npZ gGFX9uzHB8Ean8O5nPne0ztLyZOb/ZYkN02FsOdbMIW8q8nIpA+CUoUb71WTguFbOZlmF dZG7KTLmP7UD8UK8uGgul8p6H7viZkGUBYCIELW09F4JtPKjvrByp/UCORTlML/ZlHWgX IMZJZaTxm2+OUMQFEh3rho8Cnne0F60dK02J21eNPrxlcIMeLO2TET9rtrMOwBWOmdA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BJbROV82; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8ABA160A2617; Thu, 19 Nov 2026 03:29:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BJbROV82 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E429A1F000C9; Thu, 19 Nov 2026 03:29:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058972; bh=g7qUltljiPo+F2ru09crKPF1bOUC9kCo0TOjeYFw6PE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BJbROV82mR6DkhTMYMCvhOvwfigN84K0ojg2exb/Z2KieVG3zpp2AHlOb9VEJsRRw GKgxlQ8O/wak9SnEEXxG6V1mmGLs7T7xDk/RKT9bYt5nxI/bg/R2gievM2QyDIwLVw AOEtXpYeIq7FdICrWhYnGFat52w4vhAvR7SEOvSw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Peihan Liu , Yilin Zhu , Ren Wei , Eulgyu Kim , Jaeyoung Chung , Sabrina Dubroca , Steffen Klassert , Sasha Levin Subject: [PATCH 5.10 0677/1848] xfrm: espintcp: reorder operations within espintcp_init_sk Date: Wed, 18 Nov 2026 15:45:15 +0100 Message-ID: <20261118145944.196476917@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sabrina Dubroca [ Upstream commit f9a11716c8445b496e9fafeec7e8412d384d02e2 ] When enabled on a socket, espintcp sets the socket callbacks to its own before it has finished setting up its context and published it as icsk_ulp_data. Any one of those callbacks that gets called before will dereference a NULL icsk_ulp_data. Fix this by reording the operations, and add memory barriers to ensure callers will have a struct espintcp_ctx available. Add a few WRITE_ONCE/READ_ONCE too while we're there. Fixes: e27cca96cd68 ("xfrm: add espintcp (RFC 8229)") Cc: stable@vger.kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Reported-by: Peihan Liu Reported-by: Yilin Zhu Reported-by: Ren Wei Reported-by: Eulgyu Kim Reported-by: Jaeyoung Chung Link: https://lore.kernel.org/all/c30b645074a1b379e0f7fe297f917c66137d9964.1778464688.git.zylzyl2333@gmail.com/ Link: https://lore.kernel.org/all/20260819155349.3555804-1-jjy600901@snu.ac.kr Signed-off-by: Sabrina Dubroca Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- include/net/espintcp.h | 5 +++-- net/xfrm/espintcp.c | 41 +++++++++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/include/net/espintcp.h b/include/net/espintcp.h index 0335bbd76552a..d8fb608ec6ea1 100644 --- a/include/net/espintcp.h +++ b/include/net/espintcp.h @@ -34,7 +34,8 @@ static inline struct espintcp_ctx *espintcp_getctx(const struct sock *sk) { struct inet_connection_sock *icsk = inet_csk(sk); - /* RCU is only needed for diag */ - return (__force void *)icsk->icsk_ulp_data; + /* pairs with smp_wmb() in espintcp_init_sk() */ + smp_rmb(); + return (__force void *)READ_ONCE(icsk->icsk_ulp_data); } #endif diff --git a/net/xfrm/espintcp.c b/net/xfrm/espintcp.c index ce97c28dd5797..aa0924287317e 100644 --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -426,7 +426,9 @@ static void espintcp_destruct(struct sock *sk) bool tcp_is_ulp_esp(struct sock *sk) { - return sk->sk_prot == &espintcp_prot || sk->sk_prot == &espintcp6_prot; + const struct proto *prot = READ_ONCE(sk->sk_prot); + + return prot == &espintcp_prot || prot == &espintcp6_prot; } EXPORT_SYMBOL_GPL(tcp_is_ulp_esp); @@ -458,33 +460,40 @@ static int espintcp_init_sk(struct sock *sk) __sk_dst_reset(sk); - strp_check_rcv(&ctx->strp); skb_queue_head_init(&ctx->ike_queue); skb_queue_head_init(&ctx->out_queue); + INIT_WORK(&ctx->work, espintcp_tx_work); + + ctx->saved_data_ready = sk->sk_data_ready; + ctx->saved_write_space = sk->sk_write_space; + ctx->saved_destruct = sk->sk_destruct; + + /* avoid using task_frag */ + sk->sk_allocation = GFP_ATOMIC; + + rcu_assign_pointer(icsk->icsk_ulp_data, ctx); + + /* pairs with smp_rmb() in espintcp_getctx() */ + smp_wmb(); + + WRITE_ONCE(sk->sk_data_ready, espintcp_data_ready); + WRITE_ONCE(sk->sk_write_space, espintcp_write_space); + sk->sk_destruct = espintcp_destruct; if (sk->sk_family == AF_INET) { - sk->sk_prot = &espintcp_prot; - sk->sk_socket->ops = &espintcp_ops; + WRITE_ONCE(sk->sk_prot, &espintcp_prot); + WRITE_ONCE(sk->sk_socket->ops, &espintcp_ops); } else { mutex_lock(&tcpv6_prot_mutex); if (!espintcp6_prot.recvmsg) build_protos(&espintcp6_prot, &espintcp6_ops, sk->sk_prot, sk->sk_socket->ops); mutex_unlock(&tcpv6_prot_mutex); - sk->sk_prot = &espintcp6_prot; - sk->sk_socket->ops = &espintcp6_ops; + WRITE_ONCE(sk->sk_prot, &espintcp6_prot); + WRITE_ONCE(sk->sk_socket->ops, &espintcp6_ops); } - ctx->saved_data_ready = sk->sk_data_ready; - ctx->saved_write_space = sk->sk_write_space; - ctx->saved_destruct = sk->sk_destruct; - sk->sk_data_ready = espintcp_data_ready; - sk->sk_write_space = espintcp_write_space; - sk->sk_destruct = espintcp_destruct; - rcu_assign_pointer(icsk->icsk_ulp_data, ctx); - INIT_WORK(&ctx->work, espintcp_tx_work); - /* avoid using task_frag */ - sk->sk_allocation = GFP_ATOMIC; + strp_check_rcv(&ctx->strp); return 0; -- 2.53.0