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 7B105208D0 for ; Sat, 25 Apr 2026 09:55:23 +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=1777110923; cv=none; b=WJV+k8yFDGggapmjIAiPzqMB7tMMEp+QSojjtD2Fhf6LTJlCemdCZX7BLKcNm4Zu+1MyUUEbFz+WN+5jWLkTkzRsAWO1gUC9zkR4NW3FgyVxqqu1jYOaFtOgVbreSRQ197+bDaReqIaHvOy7zltsf/cKSoJQjFoBt9XOQjLzd9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777110923; c=relaxed/simple; bh=4TrX8vk8tUYRr9EbF+BxcIX8keOhs/weAsthG6wU644=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=toRwW9ifGamr8P3b4p6XUYQJHbLlC9p6OxBF/rhvD8iWynA/du2y4/NzYEd3ftBFOAMVv1ZSGP0wqD3jsIb0cmRwZNPjulspGdPB/1CIc0TYhKN2Eq6D2/nbZufWi08ZHeiHOcoX9PpMCmweUiG5CKlaGNov7cK3bk5ewrC+/wA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uEphm3m+; 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="uEphm3m+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9686DC2BCB0; Sat, 25 Apr 2026 09:55:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777110923; bh=4TrX8vk8tUYRr9EbF+BxcIX8keOhs/weAsthG6wU644=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uEphm3m+DvIvZiwX86lMkfPpHV3Uo+OU+HqHF3QMduXVUfTz1GjcVRAEFZ1h6aMXm j7vRyDwsR46Wz1WVyN37fVfGS8AEsgVwXt8i1DLqbN67hkSkS1ej0wfa+u8YJlddac dsykwOJp+jzjI6v6ZO+8OwwrzHHKNalsKErz7EXasv487ObIXTYO05lep1E1BXddZP E0T49nERhhj+p0hcnSliXNBQwtGKGKKStMEWj6G+gyr/2kf+04dc8SJ6RT4FY2Kklq 2P2uBbcjYd+Lx65JXfYNLSf8RUj62i7NpvSW0Sh4p7S+zokrwsJEy7UQReMf/8JKHa qc9GErD+SnrhQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Bingquan Chen , Willem de Bruijn , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] net/packet: fix TOCTOU race on mmap'd vnet_hdr in tpacket_snd() Date: Sat, 25 Apr 2026 05:55:19 -0400 Message-ID: <20260425095519.3477961-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026042433-outwit-cognitive-f970@gregkh> References: <2026042433-outwit-cognitive-f970@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bingquan Chen [ Upstream commit 2c054e17d9d41f1020376806c7f750834ced4dc5 ] In tpacket_snd(), when PACKET_VNET_HDR is enabled, vnet_hdr points directly into the mmap'd TX ring buffer shared with userspace. The kernel validates the header via __packet_snd_vnet_parse() but then re-reads all fields later in virtio_net_hdr_to_skb(). A concurrent userspace thread can modify the vnet_hdr fields between validation and use, bypassing all safety checks. The non-TPACKET path (packet_snd()) already correctly copies vnet_hdr to a stack-local variable. All other vnet_hdr consumers in the kernel (tun.c, tap.c, virtio_net.c) also use stack copies. The TPACKET TX path is the only caller of virtio_net_hdr_to_skb() that reads directly from user-controlled shared memory. Fix this by copying vnet_hdr from the mmap'd ring buffer to a stack-local variable before validation and use, consistent with the approach used in packet_snd() and all other callers. Fixes: 1d036d25e560 ("packet: tpacket_snd gso and checksum offload") Signed-off-by: Bingquan Chen Reviewed-by: Willem de Bruijn Link: https://patch.msgid.link/20260418112006.78823-1-patzilla007@gmail.com Signed-off-by: Jakub Kicinski [ replaced `vnet_hdr_sz` with `sizeof(vnet_hdr)` and `if (vnet_hdr_sz)` with `if (po->has_vnet_hdr)` ] Signed-off-by: Sasha Levin --- net/packet/af_packet.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 502d2f6de18a2..23dc4f66d4d13 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2767,7 +2767,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) { struct sk_buff *skb = NULL; struct net_device *dev; - struct virtio_net_hdr *vnet_hdr = NULL; + struct virtio_net_hdr vnet_hdr; + bool has_vnet_hdr = false; struct sockcm_cookie sockc; __be16 proto; int err, reserve = 0; @@ -2867,16 +2868,20 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) hlen = LL_RESERVED_SPACE(dev); tlen = dev->needed_tailroom; if (po->has_vnet_hdr) { - vnet_hdr = data; - data += sizeof(*vnet_hdr); - tp_len -= sizeof(*vnet_hdr); - if (tp_len < 0 || - __packet_snd_vnet_parse(vnet_hdr, tp_len)) { + data += sizeof(vnet_hdr); + tp_len -= sizeof(vnet_hdr); + if (tp_len < 0) { + tp_len = -EINVAL; + goto tpacket_error; + } + memcpy(&vnet_hdr, data - sizeof(vnet_hdr), sizeof(vnet_hdr)); + if (__packet_snd_vnet_parse(&vnet_hdr, tp_len)) { tp_len = -EINVAL; goto tpacket_error; } copylen = __virtio16_to_cpu(vio_le(), - vnet_hdr->hdr_len); + vnet_hdr.hdr_len); + has_vnet_hdr = true; } copylen = max_t(int, copylen, dev->hard_header_len); skb = sock_alloc_send_skb(&po->sk, @@ -2913,12 +2918,12 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) } } - if (po->has_vnet_hdr) { - if (virtio_net_hdr_to_skb(skb, vnet_hdr, vio_le())) { + if (has_vnet_hdr) { + if (virtio_net_hdr_to_skb(skb, &vnet_hdr, vio_le())) { tp_len = -EINVAL; goto tpacket_error; } - virtio_net_hdr_set_proto(skb, vnet_hdr); + virtio_net_hdr_set_proto(skb, &vnet_hdr); } skb->destructor = tpacket_destruct_skb; -- 2.53.0