From nobody Wed Sep 17 06:28:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D90C3C4332F for ; Thu, 22 Dec 2022 08:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235129AbiLVIgP (ORCPT ); Thu, 22 Dec 2022 03:36:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235003AbiLVIgF (ORCPT ); Thu, 22 Dec 2022 03:36:05 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A7D920BFD for ; Thu, 22 Dec 2022 00:36:04 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id qk9so3264261ejc.3 for ; Thu, 22 Dec 2022 00:36:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2uMiJRSZNHDn3NW9YLYywzqW5VP6C8zvivEO2dkl/lc=; b=x5zfH5cKoYc7TwFJOZjSlJap9WnyBfYMaLFLkFbdCxhN4dpbErYPAq2V0J9mVs2RXY zDSxomDcTCDPDNcfdn4ebZnP+fpscHf1o3EjjJj6KRgJXNMqSr5zTiaNYX1DE+MhcCZU 6w7mT7NSaF/UYCtlnCJcAiMMyqo1KnfwqLUsCIbQmhPxvW7x2o2vhLKppMXCMgxtlm4g dwq2mnNXvQgynAjA/7WXMXPdq0OCPVmr7PaV58DJ5WsRqhqOopFKvkmbVQ/t3b3n/Uro R5Voe+m3HMsmfeiAbIWQvmZp6pnAQawJJl8glR5/KbjCaJ+mYIgO9iscni6sKL2d8UZP 3qNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2uMiJRSZNHDn3NW9YLYywzqW5VP6C8zvivEO2dkl/lc=; b=BqQwhDAe6UxbDx4YSM4xN79YCiLFSEzvQ01HMzGSn1IWvHiURGv5e2M9Dh65BOkpio k5ZrHqX+Cw66O3UtjYDOpKHsnYrdBvxl5v8H+sJkBbl6THKjjuYtcK4WoTll7Dgytrww u75GFnvVDL8cStKt4A2NvYYRgupiQaSE5/fJdy+cAr7TAiuShbgZRVWT2SxFlWAIk/tj x8cbHbSgnyJNAmRcBGvttpEjsNHjTIldv2pFoewxOqCj6piU34UShiGgetGB/wfe7ojU F2gRWm6ZhxY/pIolh08SuRbJoLED5h5Eb2xhVJyKBfCyeim0hXpSjv0B2dUauUq2Jmfy JXbg== X-Gm-Message-State: AFqh2kouiqw4JjjA0v5FeKUQ0ocBMsRKKme/LZIFpAhbwlYIOnhnCEC3 oBJC3F3maxA4Z7o08osNvVdHiQ== X-Google-Smtp-Source: AMrXdXvNJsbgYslmqSlpw/BpNiKogMIIBf2hsJYS+/heVsntym5fUx2DaCfXFcfB8MDu7YeMuDw8Rw== X-Received: by 2002:a17:906:b7c4:b0:7c0:dac7:36dc with SMTP id fy4-20020a170906b7c400b007c0dac736dcmr7495896ejb.46.1671698162883; Thu, 22 Dec 2022 00:36:02 -0800 (PST) Received: from alba.. ([82.77.81.131]) by smtp.gmail.com with ESMTPSA id t16-20020a1709060c5000b007c14ae38a80sm7987721ejf.122.2022.12.22.00.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 00:36:02 -0800 (PST) From: Tudor Ambarus To: stable@vger.kernel.org Cc: willemdebruijn.kernel@gmail.com, mst@redhat.com, jasowang@redhat.com, edumazet@google.com, virtualization@lists.linux-foundation.org, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, willemb@google.com, syzkaller@googlegroups.com, liuhangbin@gmail.com, linux-kernel@vger.kernel.org, joneslee@google.com, syzbot+3d91b8dbbcf515400e92@syzkaller.appspotmail.com, Tudor Ambarus Subject: [PATCH 1/2] net/af_packet: add VLAN support for AF_PACKET SOCK_RAW GSO Date: Thu, 22 Dec 2022 10:35:44 +0200 Message-Id: <20221222083545.1972489-2-tudor.ambarus@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221222083545.1972489-1-tudor.ambarus@linaro.org> References: <20221222083545.1972489-1-tudor.ambarus@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hangbin Liu [ Upstream commit dfed913e8b55a0c2c4906f1242fd38fd9a116e49 ] Before the blammed commit, the kernel drops GSO VLAN tagged packet if it's created with socket(AF_PACKET, SOCK_RAW, 0) plus virtio_net_hdr. The reason is AF_PACKET doesn't adjust the skb network header if there is a VLAN tag. Then after virtio_net_hdr_set_proto() called, the skb->protocol will be set to ETH_P_IP/IPv6. And in later inet/ipv6_gso_segment() the skb is dropped as network header position is invalid. The blammed commit introduces a kernel BUG in __skb_gso_segment for AF_PACKET SOCK_RAW GSO VLAN tagged packets. What happens is that virtio_net_hdr_set_proto() exists early as skb->protocol is already set to ETH_P_ALL. Then in packet_parse_headers() skb->protocol is set to ETH_P_8021AD, but neither the network header position is adjusted, nor the mac header is pulled. Thus when we get to validate the xmit skb and enter skb_mac_gso_segment(), skb->mac_len has value 14, but vlan_depth gets updated to 18 after skb_network_protocol() is called. This causes the BUG_ON from __skb_pull(skb, vlan_depth) to be hit, as the mac header has not been pulled yet. Let's handle VLAN packets by adjusting network header position in packet_parse_headers(). The adjustment is safe and does not affect the later xmit as tap device also did that. The mac header pull is handled in a following commit: commit e9d3f80935b6 ("net/af_packet: make sure to pull mac header") In packet_snd(), packet_parse_headers() need to be moved before calling virtio_net_hdr_set_proto(), so we can set correct skb->protocol and network header first. There is no need to update tpacket_snd() as it calls packet_parse_headers() in tpacket_fill_skb(), which is already before calling virtio_net_hdr_* functions. skb->no_fcs setting is also moved upper to make all skb settings together and keep consistency with function packet_sendmsg_spkt(). Cc: stable@vger.kernel.org # 5.4+ Fixes: 1ed1d5921139 ("net: skip virtio_net_hdr_set_proto if protocol alread= y set") Reported-by: syzbot+3d91b8dbbcf515400e92@syzkaller.appspotmail.com Signed-off-by: Hangbin Liu Acked-by: Willem de Bruijn Acked-by: Michael S. Tsirkin Link: https://lore.kernel.org/r/20220425014502.985464-1-liuhangbin@gmail.com Signed-off-by: Paolo Abeni Tested-by: Tudor Ambarus [ta: Update commit description, add Cc, Fixes, Reported-by and Tested-by.] Signed-off-by: Tudor Ambarus --- net/packet/af_packet.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index ceca0d6c41b5..f25fa75fe651 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1888,12 +1888,20 @@ static int packet_rcv_spkt(struct sk_buff *skb, str= uct net_device *dev, =20 static void packet_parse_headers(struct sk_buff *skb, struct socket *sock) { + int depth; + if ((!skb->protocol || skb->protocol =3D=3D htons(ETH_P_ALL)) && sock->type =3D=3D SOCK_RAW) { skb_reset_mac_header(skb); skb->protocol =3D dev_parse_header_protocol(skb); } =20 + /* Move network header to the right position for VLAN tagged packets */ + if (likely(skb->dev->type =3D=3D ARPHRD_ETHER) && + eth_type_vlan(skb->protocol) && + __vlan_get_protocol(skb, skb->protocol, &depth) !=3D 0) + skb_set_network_header(skb, depth); + skb_probe_transport_header(skb); } =20 @@ -3008,6 +3016,11 @@ static int packet_snd(struct socket *sock, struct ms= ghdr *msg, size_t len) skb->mark =3D sockc.mark; skb->tstamp =3D sockc.transmit_time; =20 + if (unlikely(extra_len =3D=3D 4)) + skb->no_fcs =3D 1; + + packet_parse_headers(skb, sock); + if (has_vnet_hdr) { err =3D virtio_net_hdr_to_skb(skb, &vnet_hdr, vio_le()); if (err) @@ -3016,11 +3029,6 @@ static int packet_snd(struct socket *sock, struct ms= ghdr *msg, size_t len) virtio_net_hdr_set_proto(skb, &vnet_hdr); } =20 - packet_parse_headers(skb, sock); - - if (unlikely(extra_len =3D=3D 4)) - skb->no_fcs =3D 1; - err =3D po->xmit(skb); if (unlikely(err !=3D 0)) { if (err > 0) --=20 2.34.1 From nobody Wed Sep 17 06:28:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50DD9C4332F for ; Thu, 22 Dec 2022 08:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235132AbiLVIgU (ORCPT ); Thu, 22 Dec 2022 03:36:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235113AbiLVIgI (ORCPT ); Thu, 22 Dec 2022 03:36:08 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABFEAB1D2 for ; Thu, 22 Dec 2022 00:36:06 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id jo4so3222199ejb.7 for ; Thu, 22 Dec 2022 00:36:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nJeSRMEsGlOyoCrFz7jRwGpaydIfkCkTYRay7kyfDKg=; b=B88hXEeVkFdEhyxw7AqfSTOslMZz1FeeF+DhsBEI+YhVMqh/uGnu1Wg5e0lYiiJ4Z5 JwKY8I76rknWAmlvsbx/XBHqQ94/jMpVaAHerWc46OJ22nHhF3aRwYEmvRLq2J5n1Idr yKVHF0arnv+gBDWrdZwcyMwdUwO0MuuvHYAMrHy8r0Y+6pT3T8K70YITOhzPV3mkGPZv TLrPQs65UB2YmZ4oMEzQDae1AQ8WVVVJGRoAq9LnAo1eFwmfNEz6fRypJuTHrJfLRa9V F73+tHzidWgvouv73r/CzLQKmfVhEJ3qWXX4wpvUDnqXfrrP8gTf2iQBrMFHwlaZSxsR oMoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nJeSRMEsGlOyoCrFz7jRwGpaydIfkCkTYRay7kyfDKg=; b=wViI7KFK4iUhtWug3iVmfX5Ro0lXXf887szC4dwzGiUQQsTKALWuLGT0TFG2ZKsn5C kDs/k/rUn1D57jb46yHIoNOOICDKgmfWn6JRD1nuOE9kjHIkeU1VFSzHrC28NP1MJaqH 8U29iSglUQmI22k5AvEHZc1xgwrd4DsqhBr48NPo5JJKbiwUBb0U747UEiGdVEVW9dDR 0dt3Cjyj+1OiUSxPDfQEfBW706f8AwAbV6MURpsVvmXx1XzNVw4NBC7U6kBmSRmjZuPX AtfP2hjamqhN1tybPyaenjQ5S/S3pnX5ovKCsXpRIW4hTy6eYoNJQ7wlSuPIsePAWV8B WzNw== X-Gm-Message-State: AFqh2kqqJKUwNdrq8VeMkxYdLJBSfxr+mrJWlBw6om3x5i6EJZG9Fl/D V+RH1VE710r58ve/NGudh10iug== X-Google-Smtp-Source: AMrXdXt6vS7x3cvd87wggxfv7y+AbuMQz9PbaF9eD4y39uTYWJ5YB1oyMS7C2YipfNNNsFoSwr7v1g== X-Received: by 2002:a17:906:3898:b0:7c0:d31d:640 with SMTP id q24-20020a170906389800b007c0d31d0640mr3946639ejd.74.1671698166304; Thu, 22 Dec 2022 00:36:06 -0800 (PST) Received: from alba.. ([82.77.81.131]) by smtp.gmail.com with ESMTPSA id t16-20020a1709060c5000b007c14ae38a80sm7987721ejf.122.2022.12.22.00.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 00:36:05 -0800 (PST) From: Tudor Ambarus To: stable@vger.kernel.org Cc: willemdebruijn.kernel@gmail.com, mst@redhat.com, jasowang@redhat.com, edumazet@google.com, virtualization@lists.linux-foundation.org, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, willemb@google.com, syzkaller@googlegroups.com, liuhangbin@gmail.com, linux-kernel@vger.kernel.org, joneslee@google.com, Tudor Ambarus Subject: [PATCH 2/2] net/af_packet: make sure to pull mac header Date: Thu, 22 Dec 2022 10:35:45 +0200 Message-Id: <20221222083545.1972489-3-tudor.ambarus@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221222083545.1972489-1-tudor.ambarus@linaro.org> References: <20221222083545.1972489-1-tudor.ambarus@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Eric Dumazet [ Upstream commit e9d3f80935b6607dcdc5682b00b1d4b28e0a0c5d ] GSO assumes skb->head contains link layer headers. tun device in some case can provide base 14 bytes, regardless of VLAN being used or not. After blamed commit, we can end up setting a network header offset of 18+, we better pull the missing bytes to avoid a posible crash in GSO. syzbot report was: kernel BUG at include/linux/skbuff.h:2699! invalid opcode: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 3601 Comm: syz-executor210 Not tainted 5.18.0-syzkaller-11338-g= 2c5ca23f7414 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Goo= gle 01/01/2011 RIP: 0010:__skb_pull include/linux/skbuff.h:2699 [inline] RIP: 0010:skb_mac_gso_segment+0x48f/0x530 net/core/gro.c:136 Code: 00 48 c7 c7 00 96 d4 8a c6 05 cb d3 45 06 01 e8 26 bb d0 01 e9 2f fd = ff ff 49 c7 c4 ea ff ff ff e9 f1 fe ff ff e8 91 84 19 fa <0f> 0b 48 89 df e= 8 97 44 66 fa e9 7f fd ff ff e8 ad 44 66 fa e9 48 RSP: 0018:ffffc90002e2f4b8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000012 RCX: 0000000000000000 RDX: ffff88805bb58000 RSI: ffffffff8760ed0f RDI: 0000000000000004 RBP: 0000000000005dbc R08: 0000000000000004 R09: 0000000000000fe0 R10: 0000000000000fe4 R11: 0000000000000000 R12: 0000000000000fe0 R13: ffff88807194d780 R14: 1ffff920005c5e9b R15: 0000000000000012 FS: 000055555730f300(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000200015c0 CR3: 0000000071ff8000 CR4: 0000000000350ee0 Call Trace: __skb_gso_segment+0x327/0x6e0 net/core/dev.c:3411 skb_gso_segment include/linux/netdevice.h:4749 [inline] validate_xmit_skb+0x6bc/0xf10 net/core/dev.c:3669 validate_xmit_skb_list+0xbc/0x120 net/core/dev.c:3719 sch_direct_xmit+0x3d1/0xbe0 net/sched/sch_generic.c:327 __dev_xmit_skb net/core/dev.c:3815 [inline] __dev_queue_xmit+0x14a1/0x3a00 net/core/dev.c:4219 packet_snd net/packet/af_packet.c:3071 [inline] packet_sendmsg+0x21cb/0x5550 net/packet/af_packet.c:3102 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:734 ____sys_sendmsg+0x6eb/0x810 net/socket.c:2492 ___sys_sendmsg+0xf3/0x170 net/socket.c:2546 __sys_sendmsg net/socket.c:2575 [inline] __do_sys_sendmsg net/socket.c:2584 [inline] __se_sys_sendmsg net/socket.c:2582 [inline] __x64_sys_sendmsg+0x132/0x220 net/socket.c:2582 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 RIP: 0033:0x7f4b95da06c9 Code: 28 c3 e8 4a 15 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 = 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff f= f 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffd7defc4c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007ffd7defc4f0 RCX: 00007f4b95da06c9 RDX: 0000000000000000 RSI: 0000000020000140 RDI: 0000000000000003 RBP: 0000000000000003 R08: bb1414ac00000050 R09: bb1414ac00000050 R10: 0000000000000004 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffd7defc4e0 R14: 00007ffd7defc4d8 R15: 00007ffd7defc4d4 Cc: stable@vger.kernel.org # 5.4+ Fixes: dfed913e8b55 ("net/af_packet: add VLAN support for AF_PACKET SOCK_RA= W GSO") Signed-off-by: Eric Dumazet Reported-by: syzbot Acked-by: Hangbin Liu Acked-by: Willem de Bruijn Cc: Michael S. Tsirkin Signed-off-by: Jakub Kicinski Tested-by: Tudor Ambarus Signed-off-by: Tudor Ambarus --- net/packet/af_packet.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index f25fa75fe651..7f9f2d0ef0e6 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1899,8 +1899,10 @@ static void packet_parse_headers(struct sk_buff *skb= , struct socket *sock) /* Move network header to the right position for VLAN tagged packets */ if (likely(skb->dev->type =3D=3D ARPHRD_ETHER) && eth_type_vlan(skb->protocol) && - __vlan_get_protocol(skb, skb->protocol, &depth) !=3D 0) - skb_set_network_header(skb, depth); + __vlan_get_protocol(skb, skb->protocol, &depth) !=3D 0) { + if (pskb_may_pull(skb, depth)) + skb_set_network_header(skb, depth); + } =20 skb_probe_transport_header(skb); } --=20 2.34.1