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 B2DDD14A82; Thu, 12 Dec 2024 15:45:18 +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=1734018318; cv=none; b=I1tYi7fCzDEuEJd9+a6Nseuhp0I/xdpYCIpoeFRUmwmDIURo0A5ulC60HDHghboReFw1Rp86Xq21iMeqm+27HURgltZM410sZXs4AbwfOpVtEB1OXydP9O0ZSImZU1YYCxd0uKscuN0hqki0P1C5a+W2TQcnRe3UjO3I7Hy+N90= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734018318; c=relaxed/simple; bh=pPB0gMALgvBR3Ee8sALepERp7jbUq5VwCD87dASfe5E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kfk+HxECoZspSfIV1Oox+69zjsku0oqiOSvoleKDTrpR49kWJM3c5mNbHofO3OhXYW+lFJG6aO2xTtWoc/CF0sAunKxNpfhUfLd0GQRzx98xN0EhaO4ZNuY7wQnrNh69X32VYgRw5iDJ7O7A8ShFa4hTdJdHh+D7pEZPQpBcnU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AeMs2FhA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="AeMs2FhA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07288C4CECE; Thu, 12 Dec 2024 15:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734018318; bh=pPB0gMALgvBR3Ee8sALepERp7jbUq5VwCD87dASfe5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AeMs2FhAGnVJYVkJ4/30BwoE4EEGp/ofUOaM1e4gFOzgrR9zSei9K8aHVd/bAPvYH 2UOwpJb0CPyaflF3VKCbjMCv4RAd8TG7qZar0IWgNTwis7XorH6a69ToC451Oydj3a 2FasgjMZol0qaLhpZOwWNXUMM4DsfMrn1bb9NU0I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ignat Korchagin , Kuniyuki Iwashima , Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 229/356] net: inet: do not leave a dangling sk pointer in inet_create() Date: Thu, 12 Dec 2024 15:59:08 +0100 Message-ID: <20241212144253.667444511@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144244.601729511@linuxfoundation.org> References: <20241212144244.601729511@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 3feff7f738a48..f336b2ddf9724 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -375,32 +375,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