From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 232071FCF55; Sun, 24 Nov 2024 13:43:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455793; cv=none; b=EIyJqefcjs4vYY+QlgcV6AFV6oDNmuBLtUAtQSc4BcyUdQ3cRgmScM3o5E1FnWXHxnvWC5z9Jt7Xi0apSFG+uOdCTbdwS8JPe+T7v1qJYawfuy1gLSrwd9fcgtu0t7PBIJq61AVw7i6YSWTmN4msZZDZX9ll58u7XJ28TsBFk3o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455793; c=relaxed/simple; bh=rwE/gYKz3gp1O/Dn0YwKDHifPt1Cbk3jgQE3nvep8Mg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W7T0RvJBWd/fWIJB2J1G6Wr4DqoCMVA6LF8ib1j0wc6bf1KJ2iEwbpaMQQElRH/MjIL5L4RP2oSrTpo/XShJkO1+WCyiQQXDKpze+CcOVgldiC2rMtz2YbgqsEpWDUyqNLRfd7V4uOrPN6E73aKEFpoajcs9P/x3662I7MU4ARY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bwngCBtF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bwngCBtF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30CBAC4CED3; Sun, 24 Nov 2024 13:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732455791; bh=rwE/gYKz3gp1O/Dn0YwKDHifPt1Cbk3jgQE3nvep8Mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bwngCBtFCB8enBIR7jDVfZo0fPJYYDZCvoNGHZB2RCj9ly2rE5vUmw7DpF039qyxI mT6kSfM4LBqZgWhUtrDxM9ZBlSC6A3CDepqO3BncgjpOdtqVWOfGht26c0ScqNvPWc 3urhGQREOikY2aMORpvHzBGlliZzBMzqaZyXYvOIFe/ZJhyGsvCpW6/p4JADMdI6em fJ+PWwsDWzH+knBma9OZzmthuimqsH3lQjHMpE13vq3vhjVBgGJmBld05rWsMfFJI+ JM3rvkn3V3w65PupFsh8kZgV2TPfiZw7QRm9pFUzzqiR7jiqXSWb2FrZCaBVVbSqf3 eEO8jIAOlHHAA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ignat Korchagin , Kuniyuki Iwashima , Eric Dumazet , Jakub Kicinski , Sasha Levin , davem@davemloft.net, dsahern@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.11 38/87] net: inet6: do not leave a dangling sk pointer in inet6_create() Date: Sun, 24 Nov 2024 08:38:16 -0500 Message-ID: <20241124134102.3344326-38-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124134102.3344326-1-sashal@kernel.org> References: <20241124134102.3344326-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11.10 Content-Transfer-Encoding: 8bit From: Ignat Korchagin [ Upstream commit 9df99c395d0f55fb444ef39f4d6f194ca437d884 ] sock_init_data() attaches the allocated sk pointer to the provided sock object. If inet6_create() fails later, the sk object is released, but the sock object retains the dangling sk pointer, which may cause use-after-free later. Clear the sock sk pointer on error. Signed-off-by: Ignat Korchagin Reviewed-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20241014153808.51894-8-ignat@cloudflare.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/af_inet6.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 90d2c7e3f5e92..3b06997f58342 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -252,31 +252,29 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, */ inet->inet_sport = htons(inet->inet_num); err = sk->sk_prot->hash(sk); - if (err) { - sk_common_release(sk); - goto out; - } + if (err) + goto out_sk_release; } if (sk->sk_prot->init) { err = sk->sk_prot->init(sk); - if (err) { - sk_common_release(sk); - goto out; - } + if (err) + goto out_sk_release; } if (!kern) { err = BPF_CGROUP_RUN_PROG_INET_SOCK(sk); - if (err) { - sk_common_release(sk); - goto out; - } + if (err) + goto out_sk_release; } out: return err; out_rcu_unlock: rcu_read_unlock(); goto out; +out_sk_release: + sk_common_release(sk); + sock->sk = NULL; + goto out; } static int __inet6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len, -- 2.43.0