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 556982236F0; Thu, 12 Dec 2024 17:09:44 +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=1734023384; cv=none; b=vDNMgqVSKSit43PCNa5U8FCxeHG9ExYVytzMn/0LtP06y78IsT+BPziOgMnIlYVCd1jZ3Z/tJ1vuu9MhVUBk8Nza/1KkZd8++TXc080A8Rn4RFym7F9r8a+nft6tUjWvVBK/NYGO1KxxO4h4bTXxWnDZfC/zmzYrqGVjtO1Kcrs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734023384; c=relaxed/simple; bh=rv1x2Y6/pK7pU4+/aXlyDuXn7AbsnjO7f6DpooVC+uA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+UV2vngCsIQUIPrGvIaAWpCPox6NpUYlkaNmxc9TR0vvsFQddXL2ml2CpYNLJFArb/pF153ey8HWE+txhcskrSEGOdTIbDI1Hok+gi5BJpBnywtoBj0BeRyMXYj5w45wNkNBQYG6Eai/4sDR9fhFdtMUHutzouHNm1TWNpC+k0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Q+40S+H5; 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="Q+40S+H5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C72B2C4CEDF; Thu, 12 Dec 2024 17:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734023384; bh=rv1x2Y6/pK7pU4+/aXlyDuXn7AbsnjO7f6DpooVC+uA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q+40S+H5oqFExsDbShRtp6P0q1lV5EMlbVWymPgF8XHMyATnnaROKMMnFIhK26lSL 2YccZzyGo9EVt/v5V4g56gZD3OxvJPsPzXmPZ+TQhL6RuzW+Y4yC7MBejU8qnEVA2B qVktH9iiI0TWm78nqB3dJLPE1lcc1Wd66PTjnTCc= 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.15 486/565] af_packet: avoid erroring out after sock_init_data() in packet_create() Date: Thu, 12 Dec 2024 16:01:21 +0100 Message-ID: <20241212144330.972407508@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@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.15-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 d1ae1d9133d30..dd38cf0c9040d 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3384,18 +3384,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; @@ -3428,7 +3428,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, sock_prot_inuse_add(net, &packet_proto, 1); return 0; -out2: +out_sk_free: sk_free(sk); out: return err; -- 2.43.0