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 40CA41D618A; Sun, 24 Nov 2024 13:35:26 +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=1732455326; cv=none; b=V5PVd9/KyZccX8VZkSjYQNPQPO4HIg1U+9RqWhpne8FrpVyEprLI6oRaRO68QN/GySzHOPEP/PHvW4RhgAMnVb1teRFbZxmmx6yg++Dej+NUeU9cEu5ulhFlX40KrSZIOWbaVicGdiwf0jW5t5PQamBAWTiICTYKOwyWXq6ZctI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732455326; c=relaxed/simple; bh=MJkkdr2StmcTjYkJq7eEm8fCAEh5Qpd3Q4t8pexluPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U3sI6JBeV4y5DSscBpdJiu9tScYtJbqd6DJU7OxetYt3T/BOiQe24NPsZoJZpbMj+lbkDUwG1LEMLBNKS7Z9RJp+w2I20vf00yHex3t5n8GI8RTfFBIRWJQxxVzv1Z4/W4s1si/MQEzNMpTpiBmFUigI4BjSQVMN4/qiFSxWKiU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aoYfyooQ; 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="aoYfyooQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5432C4CECC; Sun, 24 Nov 2024 13:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732455326; bh=MJkkdr2StmcTjYkJq7eEm8fCAEh5Qpd3Q4t8pexluPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aoYfyooQy1G/IMVKyt+T2PfFA/XtjovVEyP7xnLmORDej8X7E+9y2OqQMuugQ4581 pax0kfwmRni8ydX8f2NKW41mu4Lh2JH4JwC3QjaaW40eUEzQpaXhOYUaLeWPO0VdaZ q19GJ5lBQi1S79nphsh0kAECXdg37dOZXhyyRBeM0sAUZnyuaV/HTV76vp4JWXnP4r rhCCAv4/tVcNX6yKrezNFO/wQFbmzBPjWZml0wlbIS2/5ui60xW+DiU8WFRdwjj8Jo 1Ef3P1lo6HT5cQBei+SraM+XS6vDcm9T2eXJ4tUIWFVMfdC9ZQHlYQcZMCXBVyozUP ihXHTFV5nF77Q== 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.12 043/107] net: inet: do not leave a dangling sk pointer in inet_create() Date: Sun, 24 Nov 2024 08:29:03 -0500 Message-ID: <20241124133301.3341829-43-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124133301.3341829-1-sashal@kernel.org> References: <20241124133301.3341829-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.12.1 Content-Transfer-Encoding: 8bit From: Ignat Korchagin [ Upstream commit 9365fa510c6f82e3aa550a09d0c5c6b44dbc78ff ] sock_init_data() attaches the allocated sk object to the provided sock object. If inet_create() fails later, the sk object is freed, but the sock object retains the dangling pointer, which may create use-after-free later. Clear the sk pointer in the sock object on error. Signed-off-by: Ignat Korchagin Reviewed-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20241014153808.51894-7-ignat@cloudflare.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/af_inet.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index b24d74616637a..8095e82de8083 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -376,32 +376,30 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, inet->inet_sport = htons(inet->inet_num); /* Add to protocol hash chains. */ 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; } -- 2.43.0