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 5B9CE228390; Sun, 24 Nov 2024 13:47:40 +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=1732456060; cv=none; b=dnRRWWBJrFdR1g9X1PWqqfdxjeP4vbeymjrTlRdBq67VqztjWKaqtKKn1P+LMlKDAZ+Hte7FA7Wy0Mikf3svz2xrph+vpYyAs/kUN+1XdKnZYAKFFkIq7e1V67orunDaslNauzRTupMoJ6qCsQEjBQJ15w8vUATEOWDmTwdkSMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456060; c=relaxed/simple; bh=CdC234Rp69TohLVwJq0ITZs9+9p//HgEzz6nOQhcquI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rMJaXHxUylZldg5P0fW56LxvcPZtJ0mqXwKUmu9XbVZ1v1l+NSh2Y0FSwDtJojVOqBDUmvop020V9hox95ETBW8GskoS0hR5LuoT9HtddXjw2f4nGVk2y6i+iGsiBqtw/ts3PtGWxhCdLOjaaFre/lQnltRYH+QKknr986owZNs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rqSs1B/r; 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="rqSs1B/r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10098C4CED1; Sun, 24 Nov 2024 13:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732456060; bh=CdC234Rp69TohLVwJq0ITZs9+9p//HgEzz6nOQhcquI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rqSs1B/rvRdde1TxjB2ygvNirKRw1z6prIqoi+O3QrBMm+I5+TraI/6sddTUC12kv Lbm823IgR3tfOu+UKMQ8Zy2+IwOFA05MKapY6EdPysvTkFo2upJIHB2GVUdPuJNo5/ Hiw1e3AFR8JGkxL7vl3Ke2YUGDuUv4iFr2xa992R/gy/JPsdHF8iEDd8NJWVlOjPwi g6SeggQKmoEF/fGoqLaFUIYFwp9h+d7UbuGBPStOXonQS5YOc67SPoY7PzLvqR7/Fh Qw4BAEfn5dfZfymshHlVe/kO0kYc4dShTIZ9s9O2EktY8upeN3N+ZvLXSk02tLlWn7 eNBXCSuVbF42A== 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.6 25/61] net: inet6: do not leave a dangling sk pointer in inet6_create() Date: Sun, 24 Nov 2024 08:45:00 -0500 Message-ID: <20241124134637.3346391-25-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124134637.3346391-1-sashal@kernel.org> References: <20241124134637.3346391-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.6.63 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 b9c50cceba568..3b31bc5a5fdce 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -250,31 +250,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