From nobody Fri Feb 13 01:40:34 2026 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (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 3D6F6130A79 for ; Tue, 4 Jun 2024 05:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717480274; cv=none; b=ncIaCUiLRYni2tZEthwmG7Wc3YFybwk4GUCf3KWjkEMdfu0S2Xe/80mxhi9Y1WwT7AI4V9Y40oSkoY7xRiyh0VBM6w9vstupqILG9/5Plxw+PJznbkuM1q3QvzGKvpXPUw9RnQRWoj9GVrEJLfPyDbQ6CVmEaU8Y6BwWyfGn/wY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717480274; c=relaxed/simple; bh=uss0X1VN88HbrrQxklnUMnnojK0g+Phe6pPxPPeCyyA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TW1fgd0hiBAyWMXcI07CACrXlpjZw9OR3MLKwfsNFMmeqAMwPIAqrOsWyNJVCw75oVmmqtnkhXgmiweCKXvW3GeGFDxoaG0JNktdABQhg+hgdNU/d31WhvJtvlNhYzsz0+RpY3NclJdo9dHd6HAtFe2D/5Y3bDe2qeJXr6IVDW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=GFnLf3Tx; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="GFnLf3Tx" Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 704763F2A1 for ; Tue, 4 Jun 2024 05:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1717480263; bh=bakozUuCaN+IM6untUm+580ISMXPQFrIaEMbe9vcbuo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=GFnLf3TxfuFyYvOzLXrGqDTZo4fyImCC02nFoHrEn/9TeanV6+w5FI7sQRMh+nbCR oy/9ZOe1cQp875wmfUg4ayEPypT5ZwVVCNYQBPNo/tZdxFkfKUvwvKzAb3I90SgJf+ h9qrx5adaVL4bHgODSSzh7/yhBfrkg1K0SUQ3illXGiK4IVZvf9v3XtZIyU7Pw8awO WPyHkxbZJPZJCBJFb5bgBRUAN9s4YOgo0HyCuOIXsZHZA3qrPbP/10uB38sHhsHLIH bFU9ljU19svJXoSuvzdm2lrQq3MbiSreGe3UGEyhUSnGpA32T979co0m1ai0L/Lc+d Mk8L8G6wlOAuw== Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-43fa039d2dbso50282121cf.2 for ; Mon, 03 Jun 2024 22:51:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717480260; x=1718085060; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bakozUuCaN+IM6untUm+580ISMXPQFrIaEMbe9vcbuo=; b=DtmnDQPiT5N5OGuC+WdtYCf03VqemTfGtASrrux/Myyz5sArHKlz13YXzDkgncmgJs KLr0g+4kTeaBoO2KX7nQM/iJJ8CcPAHn36vaPcyFBT1Ipb2NluQIuPHTm1zhLaleujzx 9EMCJshHh9J0c9DEaDUvSuhyKQFiKSuA0eQqpAZDztwB8WpET0qxfJpanz3kInLo3Ctn yI1lrjl1OqWWBfDUBwyA3ELY0TbGNnANurT9wHPl+7GhmOBvv8+i7SxoIclK185ANwQ5 DpPLYHtARWiDYGl5O3W2/LsP2sF7O2g4KSJrdsLBg3T2UUGI3qqZmsOqvkxJe7wh2sRE Qu9Q== X-Forwarded-Encrypted: i=1; AJvYcCVpuUhM/zZl7RmxET+jr6/kH8vXQ1zsgl3YK1gteMTYzXAOmbvoF7XVWhnz4v87VA7Gaqo/s42Ib98bVmsHNAHC3MDd1Hx4VLBrTUSU X-Gm-Message-State: AOJu0YzSoyk3CHr/6X0hSJfi0tqBjVDQwoL0u5bPzvThS+/s35yYClyy XlVNi/lV5pE/hQ6ozSb9y2wU1DMv80Xa4sgfhcqsN4cBoPVzyPSovkqmnjW1rugD09iy2ZyYnOT UvwA4dF45MKLVB5PCyIpEq54FbhSGqesKfNkHNO/vSAHBnhS5NGpv3Vk9sf2rjatYVjemnxqsrD 3jqw== X-Received: by 2002:ac8:7d42:0:b0:43e:3b8e:670f with SMTP id d75a77b69052e-43ff549f297mr105320041cf.43.1717480260394; Mon, 03 Jun 2024 22:51:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNNMHj3DNemo6r8ze9mxeAlNiDseNl5q4JzhvkZ5jaG0w4QaVp8XWGaG9AL3DFRkMjFlevuQ== X-Received: by 2002:ac8:7d42:0:b0:43e:3b8e:670f with SMTP id d75a77b69052e-43ff549f297mr105319801cf.43.1717480259672; Mon, 03 Jun 2024 22:50:59 -0700 (PDT) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c40b]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff23a1aacsm46472871cf.12.2024.06.03.22.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 22:50:59 -0700 (PDT) From: Chengen Du To: willemdebruijn.kernel@gmail.com Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, kaber@trash.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Chengen Du , stable@vger.kernel.org Subject: [PATCH v5] af_packet: Handle outgoing VLAN packets without hardware offloading Date: Tue, 4 Jun 2024 13:48:23 +0800 Message-ID: <20240604054823.20649-1-chengen.du@canonical.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The issue initially stems from libpcap. The ethertype will be overwritten as the VLAN TPID if the network interface lacks hardware VLAN offloading. In the outbound packet path, if hardware VLAN offloading is unavailable, the VLAN tag is inserted into the payload but then cleared from the sk_buff struct. Consequently, this can lead to a false negative when checking for the presence of a VLAN tag, causing the packet sniffing outcome to lack VLAN tag information (i.e., TCI-TPID). As a result, the packet capturing tool may be unable to parse packets as expected. The TCI-TPID is missing because the prb_fill_vlan_info() function does not modify the tp_vlan_tci/tp_vlan_tpid values, as the information is in the payload and not in the sk_buff struct. The skb_vlan_tag_present() function only checks vlan_all in the sk_buff struct. In cooked mode, the L2 header is stripped, preventing the packet capturing tool from determining the correct TCI-TPID value. Additionally, the protocol in SLL is incorrect, which means the packet capturing tool cannot parse the L3 header correctly. Link: https://github.com/the-tcpdump-group/libpcap/issues/1105 Link: https://lore.kernel.org/netdev/20240520070348.26725-1-chengen.du@cano= nical.com/T/#u Fixes: 393e52e33c6c ("packet: deliver VLAN TCI to userspace") Cc: stable@vger.kernel.org Signed-off-by: Chengen Du --- net/packet/af_packet.c | 64 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index ea3ebc160e25..53d51ac87ac6 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -538,6 +538,52 @@ static void *packet_current_frame(struct packet_sock *= po, return packet_lookup_frame(po, rb, rb->head, status); } =20 +static u16 vlan_get_tci(struct sk_buff *skb) +{ + unsigned int vlan_depth =3D skb->mac_len; + struct vlan_hdr vhdr, *vh; + u8 *skb_head =3D skb->data; + int skb_len =3D skb->len; + + if (vlan_depth) { + if (WARN_ON(vlan_depth < VLAN_HLEN)) + return 0; + vlan_depth -=3D VLAN_HLEN; + } else { + vlan_depth =3D ETH_HLEN; + } + + skb_push(skb, skb->data - skb_mac_header(skb)); + vh =3D skb_header_pointer(skb, vlan_depth, sizeof(vhdr), &vhdr); + if (skb_head !=3D skb->data) { + skb->data =3D skb_head; + skb->len =3D skb_len; + } + if (unlikely(!vh)) + return 0; + + return ntohs(vh->h_vlan_TCI); +} + +static __be16 vlan_get_protocol_dgram(struct sk_buff *skb) +{ + __be16 proto =3D skb->protocol; + + if (unlikely(eth_type_vlan(proto))) { + u8 *skb_head =3D skb->data; + int skb_len =3D skb->len; + + skb_push(skb, skb->data - skb_mac_header(skb)); + proto =3D __vlan_get_protocol(skb, proto, NULL); + if (skb_head !=3D skb->data) { + skb->data =3D skb_head; + skb->len =3D skb_len; + } + } + + return proto; +} + static void prb_del_retire_blk_timer(struct tpacket_kbdq_core *pkc) { del_timer_sync(&pkc->retire_blk_timer); @@ -1011,6 +1057,10 @@ static void prb_fill_vlan_info(struct tpacket_kbdq_c= ore *pkc, ppd->hv1.tp_vlan_tci =3D skb_vlan_tag_get(pkc->skb); ppd->hv1.tp_vlan_tpid =3D ntohs(pkc->skb->vlan_proto); ppd->tp_status =3D TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID; + } else if (unlikely(eth_type_vlan(pkc->skb->protocol))) { + ppd->hv1.tp_vlan_tci =3D vlan_get_tci(pkc->skb); + ppd->hv1.tp_vlan_tpid =3D ntohs(pkc->skb->protocol); + ppd->tp_status =3D TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID; } else { ppd->hv1.tp_vlan_tci =3D 0; ppd->hv1.tp_vlan_tpid =3D 0; @@ -2428,6 +2478,10 @@ static int tpacket_rcv(struct sk_buff *skb, struct n= et_device *dev, h.h2->tp_vlan_tci =3D skb_vlan_tag_get(skb); h.h2->tp_vlan_tpid =3D ntohs(skb->vlan_proto); status |=3D TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID; + } else if (unlikely(eth_type_vlan(skb->protocol))) { + h.h2->tp_vlan_tci =3D vlan_get_tci(skb); + h.h2->tp_vlan_tpid =3D ntohs(skb->protocol); + status |=3D TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID; } else { h.h2->tp_vlan_tci =3D 0; h.h2->tp_vlan_tpid =3D 0; @@ -2457,7 +2511,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct ne= t_device *dev, sll->sll_halen =3D dev_parse_header(skb, sll->sll_addr); sll->sll_family =3D AF_PACKET; sll->sll_hatype =3D dev->type; - sll->sll_protocol =3D skb->protocol; + sll->sll_protocol =3D (sk->sk_type =3D=3D SOCK_DGRAM) ? + vlan_get_protocol_dgram(skb) : skb->protocol; sll->sll_pkttype =3D skb->pkt_type; if (unlikely(packet_sock_flag(po, PACKET_SOCK_ORIGDEV))) sll->sll_ifindex =3D orig_dev->ifindex; @@ -3482,7 +3537,8 @@ static int packet_recvmsg(struct socket *sock, struct= msghdr *msg, size_t len, /* Original length was stored in sockaddr_ll fields */ origlen =3D PACKET_SKB_CB(skb)->sa.origlen; sll->sll_family =3D AF_PACKET; - sll->sll_protocol =3D skb->protocol; + sll->sll_protocol =3D (sock->type =3D=3D SOCK_DGRAM) ? + vlan_get_protocol_dgram(skb) : skb->protocol; } =20 sock_recv_cmsgs(msg, sk, skb); @@ -3539,6 +3595,10 @@ static int packet_recvmsg(struct socket *sock, struc= t msghdr *msg, size_t len, aux.tp_vlan_tci =3D skb_vlan_tag_get(skb); aux.tp_vlan_tpid =3D ntohs(skb->vlan_proto); aux.tp_status |=3D TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID; + } else if (unlikely(eth_type_vlan(skb->protocol))) { + aux.tp_vlan_tci =3D vlan_get_tci(skb); + aux.tp_vlan_tpid =3D ntohs(skb->protocol); + aux.tp_status |=3D TP_STATUS_VLAN_VALID | TP_STATUS_VLAN_TPID_VALID; } else { aux.tp_vlan_tci =3D 0; aux.tp_vlan_tpid =3D 0; --=20 2.43.0