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 0FFC623BFDA; Sun, 24 Nov 2024 13:52:48 +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=1732456368; cv=none; b=IttlJA51DcXKn0FwoD0v26P1VEFrtVC83agsiKtC5JjnaQXX8uKaPzM76zVyl7Nt5nqWmCCw5kaOg3eS0QpjYiI0K99cVJNv70VAXN803GYu247dQe3bTh9EUfcs9H9V1axn4xbS8EXEIhKUTv7VXOR0lzcRNNHxueSxU39s4aI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456368; c=relaxed/simple; bh=tw0UaECCfhq6Eqroxbm+Ide+16ceaUo6COMi+HIuJbg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q5LHzfPGELhkvuvbjDwh/yNxxk6O8Y8a5WDR3xfje1skqokhKr8F3DlHYjvC3YFqDuL3j4XQvtahe+P9igRBV8qlaVoMsN1depGaRBr9VEbHvLmeNHbTonW38csVdncl5Xy0psiB0WfpkWAdnhPpcEBKFK0Kl6+zaWysg/BvmZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S3tvbyBU; 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="S3tvbyBU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1932C4CED1; Sun, 24 Nov 2024 13:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732456367; bh=tw0UaECCfhq6Eqroxbm+Ide+16ceaUo6COMi+HIuJbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S3tvbyBU9x99lB1UGcWK5RY8pZDl4sN4gPIzJgWuWJFCjB1uBRrjEB72MnJzrbqck 86j0NtkQfKI30KEcWJapFJZrbmbJX7qVPLp1j3p2KIKF8WXw/wRNofgoUSB7CaTTvQ pktlD2VA0HhImvFIyBKXu+8K9lF2z/l+C4KsWN5ulgYGnUU/Se2iYRL8RZ5HhPVHn7 I4fm1YwR8J/L0jm+xnmZnWg7YAJnetRl8NaWXT01qP3UgN4yq57p7SRD8BJmnhEkG7 R4S79/wvAGQ0SWSXh1zgiLV2wNhTDJopBSpLlAH28r2Xw4AIYHHnrhG4md5zpAZABb CvMoiK0t9iR2Q== 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 5.15 15/36] net: inet6: do not leave a dangling sk pointer in inet6_create() Date: Sun, 24 Nov 2024 08:51:29 -0500 Message-ID: <20241124135219.3349183-15-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124135219.3349183-1-sashal@kernel.org> References: <20241124135219.3349183-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.173 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 bbfa5d3a16f01..4d5f5f2585da9 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -258,31 +258,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