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 98420208984; Thu, 12 Dec 2024 17:50:01 +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=1734025801; cv=none; b=cNkquK3A5dwbbZwY6/eolj4705JvJ5MNY5gt6vUSpLfXOhuZOFv4KsZNawHhxJ6UQilOCYM4zMugQ3FpTr1IziSRaBHdjtEuY89oow+DLzCugngzpwMZ4ubs578vguPBX0DKkEXkLlZpk6Q4G81ryOgsDY3q5c8o3B6gEj4dpl8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025801; c=relaxed/simple; bh=Bjq3DQJEQv9WaGh7O6mUy6b0IrrcIteOL4xYzAOmZUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ubpzrlEOvuJa1boOssbCVyw9GKA5l5SHRAynUItN9KRcEjsYNrhidwteHa/1ed/aeJmTNFUhu5/X9GZss/Zg1gkEXBSrvzR4WJ0SIay/kl9i1eDnW2OMeU9LMKXQa1IXv+4f+Ubi0nQp0Kat9cO0+h74RtUsY1XR6PVJcZ1vO6A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=G/nVIrS8; 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="G/nVIrS8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CB6AC4CECE; Thu, 12 Dec 2024 17:50:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734025801; bh=Bjq3DQJEQv9WaGh7O6mUy6b0IrrcIteOL4xYzAOmZUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G/nVIrS8mqY/3WbR5Q5Ha5RdnAisbL/u5L47YkiLnng6n/TxBdyeRVCcs/QrL+O5+ xxElywB/Xtl7ZvX31Z4zgVjCPh5EsEQPyp3e0aUHJq7htF6+Z6nhpYWEHBj5cR8vbh Y+HlWFbVPRiFblxftYzV2iRBzO/NlZynwTIiA4Ig= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Ignat Korchagin , Kuniyuki Iwashima , Willem de Bruijn , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 274/321] af_packet: avoid erroring out after sock_init_data() in packet_create() Date: Thu, 12 Dec 2024 16:03:12 +0100 Message-ID: <20241212144240.806131032@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144229.291682835@linuxfoundation.org> References: <20241212144229.291682835@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 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ignat Korchagin [ Upstream commit 46f2a11cb82b657fd15bab1c47821b635e03838b ] After sock_init_data() the allocated sk object is attached to the provided sock object. On error, packet_create() frees the sk object leaving the dangling pointer in the sock object on return. Some other code may try to use this pointer and cause use-after-free. Suggested-by: Eric Dumazet Signed-off-by: Ignat Korchagin Reviewed-by: Kuniyuki Iwashima Reviewed-by: Willem de Bruijn Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20241014153808.51894-2-ignat@cloudflare.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/packet/af_packet.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 6aed6a36ea456..88bc4a21dda45 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3357,18 +3357,18 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, if (sock->type == SOCK_PACKET) sock->ops = &packet_ops_spkt; + po = pkt_sk(sk); + err = packet_alloc_pending(po); + if (err) + goto out_sk_free; + sock_init_data(sock, sk); - po = pkt_sk(sk); init_completion(&po->skb_completion); sk->sk_family = PF_PACKET; po->num = proto; po->xmit = dev_queue_xmit; - err = packet_alloc_pending(po); - if (err) - goto out2; - packet_cached_dev_reset(po); sk->sk_destruct = packet_sock_destruct; @@ -3403,7 +3403,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, preempt_enable(); return 0; -out2: +out_sk_free: sk_free(sk); out: return err; -- 2.43.0