From mboxrd@z Thu Jan 1 00:00:00 1970 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=1794590184; b=akZp3rWcCx6uVJnbgLakbSqfvZWVjJRTaYNAsFvwvYkh7eI09S9qj0LILHP+OXi2AtRv 5Hw4+4FIQsmYEfuRcSdLDJ0kg8dIeMs5Lls2k3P3w1A/97ZS40l3QIfg79OjKQ+flUOy/ 7FHBKrKJeivLNZwGbvktm1Vra+djRl4yWWR0Nef6Nehzsw6lh1zJw/XFXypBCjA86t47j QchjiptPXLM7Q3liAOp9MNyCQFUgWhKi4+ZjjlbWBpkQnqsB++mlI5y4nuMI3yhsv0wQV CbDcjAhgIPjRdn0jyn3/jKK9VMobFyWN7BTP1JAXSOZSy6U918dAs5v6U2PJcesJqog== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590184; 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=56xqulTXxAOevv6r829nzhKJfFhyDxVY5FUlTv3PqKU=; b=DXZb7dS8eOpHocCtsFZ85H+S1sCmAQYYPfQkdJPN8WOstdfn+A62qvZOOFmglIhh7deu z5INg3yg3Z/szxNWYPSxGtK667w8NnOkRDSGoC9i370FQom+V+mBXZpO8Hx9b3xirQ8Gy ANotKGK78zKiIEIovjx2rDUydgl4aBWpgfmEfkRFW/7DHWfh7aQxlbwTO7d5D758gDs+S 0ArgcP3qCFtgMPx45rkUOliD9UDBwANz0ioAJQV+t7lfcu69nhjpiXKCRwEfaHk/0SHbo hr5hT+j5yVkXtHY63LdFW85j54orbMW86QG3bnao4TYxXK5nYTQuQSXZ2ZNbBR0srMA== 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=CIzh4Cjg; 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 C6CDB606B353; Fri, 13 Nov 2026 17:16:24 +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=CIzh4Cjg Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A47A1F000C5; Fri, 13 Nov 2026 17:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590184; bh=56xqulTXxAOevv6r829nzhKJfFhyDxVY5FUlTv3PqKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CIzh4CjgFFLBWagXqTL6ytN20UBY+FzIIWJOlcM6lkDO7Hm8fPtuVo6y+ZU264qqg hzmmGDSlWc7PUB6FHR6o9TSx5AhTSYAIlRA3iNa77xWcJTDaJjZUC7J/BoB3ovgFF6 aS+wBEJAfxNOCE+uRD7g3ElDDUG7m2J00ezxl1t0= 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 6.18 194/686] xfrm: espintcp: reorder operations within espintcp_init_sk Date: Fri, 13 Nov 2026 10:45:27 -0500 Message-ID: <20261113153827.616854600@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-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 | 43 +++++++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/include/net/espintcp.h b/include/net/espintcp.h index c70efd704b6d5..7cad3c6822df9 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) { const 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 26c0a46491a47..e36a637b4ce76 100644 --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -437,7 +437,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); @@ -469,34 +471,41 @@ 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; + sk->sk_use_task_frag = false; + + 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; - sk->sk_use_task_frag = false; + strp_check_rcv(&ctx->strp); return 0; -- 2.53.0