From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792673883; b=0Iod7/mkSww9AGycF0LcQyU6ltsR+x+6yMB8fv4XeDMoHiA9Onnwfz5VDudH+Yf+owlS 1JMbnbFexR7/nl49Xz2HjM8NTCru8Lt5PTnDGvQKpElKUEdk5erH/SOJMYLDohfsXvDfu /CfdHgMRmV42jX1oSEHASaSP0KMv1dPsnqgxOg0Y4KPAFlN30i3Xc4n5KoUa23jKR7Y3O alC5fWeWaCIzmRh5OH3OoPp1SB+yCU9kpeSm+haN3RjGkGCLBlwybOXpBVCq86+vf8jEe Hx9USoIHEfo6xER/IEDJnld185YkmccuHAissrY8tXFSPUHQ49VBz4xve8l10LA/L6w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792673883; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:X-Received:Received:Date:From: To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:Content-Transfer-Encoding:X-Mailer:X-Mutt-Fcc; bh=CCgTB6RIkCwM8dHY5A88kQSZOGczA39Y2iVzt/yKodk=; b=yKgtfobhJZuqImSVghU4/lVGegV8gmCNDYO/FRjo/GKfVjqMGjPYVbPqJS9bnFSHfAaf LI/YUDha4trInJxEGRjzKCYjAgivgMjt3q0+A1iSc9Qruev9oMMZydd7DisBTbt+TQg0M E3yqUP8puQdV7BwdhhQiOI2AYUbktLYWuzaptLi2lvcfTtMAXbva8eqEBr8vSN55w+1cS BbyjdkLb9czi5sx2HqqX1frKUEZOeUkSIY6FW3tc4stXkBCi1FgEcEq1UCJGgyCwpu8pZ UHj5N7PIap6TzJydwT431UK51MzfwE21DZsmR5QiltCBbzYD8wEwvnQ4IZzptDBd/MA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b="gix/n9gY"; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=google header.b=Qhwo9qTd; arc=none smtp.remote-ip=170.10.133.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A177F606A31B for ; Thu, 22 Oct 2026 12:58:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A177F606A31B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gix/n9gY; dkim=pass (2048-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=google header.b=Qhwo9qTd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792673881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCgTB6RIkCwM8dHY5A88kQSZOGczA39Y2iVzt/yKodk=; b=gix/n9gYIinv+7R+SKP7PpdpeaG3X+DisNZh2MAwxsfBINi84DK4Gu+uqq3TcAXmBVUiWL hAZ/TdxSs1FxRZ33BzixlAQffqW63vgJtMtBmLofcZI2qQgC2IIImnKtM72xKJ3ga0kiEP KMruw+PkVaydjL0BqWBM14Qhent0nW8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-676-I8jNWHipP1CN1ivp9QQlug-1; Thu, 22 Oct 2026 12:58:00 +0000 X-MC-Unique: I8jNWHipP1CN1ivp9QQlug-1 X-Mimecast-MFC-AGG-ID: I8jNWHipP1CN1ivp9QQlug_1792673879 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a1d7c3b38eso15685465e9.2 for ; Thu, 22 Oct 2026 05:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1792673879; x=1793278679; darn=vger.kernel.org; h=content-transfer-encoding:content-disposition:content-type :mime-version:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=CCgTB6RIkCwM8dHY5A88kQSZOGczA39Y2iVzt/yKodk=; b=Qhwo9qTdJAPtAqyz/aIr9nXfq+oU0Q79njfLpQ5OqrkvpGOl0VhUgh01eyFjlAzGvx vosaXKxXenCBzZixQe7qB76DMCWx9j/wT7G074btRadNJb4rYqRPoLRbBtw2Puw/bt5d 4o5v4mvZ62csMv++sXuVNv9VyUVxeIi9cGRDLzZGpYU93M5oFZ7b6QhgXaEOPKtgUfmh eDHp7KstgY1HQ6c1NzN50xQ64l6TqDFshPb0CH7xTcdEIbjTGFhgjLXuT9DzR9hGXmuw s1d3D+fR+Ok+VwpVvc+6xFdg4Vs7sAZkVNubRE9iq5ATeen3t/DSQTycAliBO/i44B8f znDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792673879; x=1793278679; h=content-transfer-encoding:content-disposition:content-type :mime-version:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=CCgTB6RIkCwM8dHY5A88kQSZOGczA39Y2iVzt/yKodk=; b=g+vJq+eaXGL06TtYQJ06Evrq+3vyWf5IkXHBfzz2hmZAomfb1Ea8jAfsHF4YhoIxjK tvdXbieXzEBdGAZFqvSNiMfS2lDgQXD2lpS0uaZEKXJ/NEn+zAlJgS7cbIxOguAdo0YU Dl8jLOM+VwAa4c0PiI16t+eOgBHf/RpRL1Dq50jz0KVJitpF1ImdGxU6fAhWhi0rUBIr yjXttKiCOxJLMlK8BF8jY3EBKaN5wCUQs+ELGTmI+pmnrBtMG+Wjp58Vspe+DZYGj9xA jlhMLTCBQco1XQPBbzJ0+qAJ9Ernw1HqeXwWyURKGKwU7beQDIHce2sUtllx7aOn/AkR 3CzA== X-Gm-Message-State: AFq9FYKKg6tUUdCjYMFtRelQDdIRqf7+towxkB6KjVsyKGOVfvMLqcul 7RoNMfTEvIYjDvONcr/1dEnUjLGuQ6PX/csFwqpA3KzHQCyqp9YzVW6Ate9A5yvXYDERdVa07wh LDX33yoHjzneWVM4+oc2gts8bcwL9ir21rKd8AwGNVaVMr5fCKJn4VjK/C1bM8JEL3SvR3XttDT Ax8ZlMF3GU/jILqHODO1aN0eU11wafxq+OvpiRcl4uKJ4= X-Gm-Gg: AYBFou3vkr0tc1d9BLz7rzz6w18o6DQH/ldOyhQ/75xEmTJxgtKT87ChRD3yEavq61X 0OBIGXvIBHZZ+XoFHzrzJq783JKVhylmf4eI/RGzx+dcR+GuEOrlypcsts1EZvdwlt0LrtYGv+b LCmILzrwg9qcJ66zwBdtA5BxH0LyqUUqeNwUVII4lu05iBaYEuG3gGRB5dBJMDzQMd307HjFl3+ GXZhSEkOugz4C8wZtvWuquJA+LhcFQGUdnTXloi6ShXFwQkqsitKvilJ3EVd/SGHlcouHK0BjSF 81LcHQ708LGEasbgDvzo+EnLxTI1UKbyg6ZWi9AfxWbWENaTZ458Kfntv+ZbWLuv6g4= X-Received: by 2002:a05:600c:3b17:b0:49c:cee0:e7c1 with SMTP id 5b1f17b1804b1-4a1fdd31aebmr111244175e9.16.1792673878691; Thu, 22 Oct 2026 05:57:58 -0700 (PDT) X-Received: by 2002:a05:600c:3b17:b0:49c:cee0:e7c1 with SMTP id 5b1f17b1804b1-4a1fdd31aebmr111243305e9.16.1792673877808; Thu, 22 Oct 2026 05:57:57 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:1536:fc00:b838:383:1c7:6e81]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a203b42befsm66332875e9.8.2026.10.22.05.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 05:57:56 -0700 (PDT) Date: Thu, 22 Oct 2026 08:57:54 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Willem de Bruijn , Chris Arges , =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= , Phil Sutter , Jason Wang , Eugenio =?utf-8?B?UMOpcmV6?= , Xuan Zhuo , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, virtualization@lists.linux.dev, Max Krasnyansky , Rusty Russell Subject: [PATCH net v5 0/7] more virtio-net csum hardening Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent Okay this seems to be converging.... But sashiko did find some issues I thought are best fixed. Specifically I thought of a better way to handle short gso in a tunnel - just clear tunnel gso! As a side effect we now fix up the checksum for these dodgy packets like we did before, instead of a drop. Good. And more false positives that prompted me to write a bit more comments. So here goes. Apologies for reposting so frequently, I know netdev bot will be unhappy with that. But Paulos's report made a lot of publicity, there is a lot of people looking into this, so I feel there's value in defending against all this class of issues sooner rather than later. The issues were mostly found by code inspection, but all reproduced by me in a VM. ------ As reported first by Paulos Yibelo (after which others, credited below, found more ways the bug can affect users): allowing untrusted hardware to specify csum start/offset for CHECKSUM_PARTIAL was not a good idea, because, if it edits the packet outside the actual checksum, and depending on the setup, the networking stack could be looking at the packet both before and after the edit, and seeing different results. Previously, commit 6785011f8b16 ("ipv4: validate checksum_start before completing checksum") validated all known instances where this causes the most grief, but the real fix is to make sure that either only actual checksum fields are ever edited, or the checksum is completed before the net stack looks at it, so it is always consistent. This basically goes back to what we did before f43798c27684 ("tun: Allow GSO using virtio_net_hdr"), except in a narrow list of specified known good cases. Summary of the patchset: These are probabably net material (and seem to be too big for stable, or I would recommend backporting there, too): net: account for ingress-resolved virtio net hdr state - accounting, not the fix itself, dependency of the fix um: vector: trim skbs before verifying the header - fixes the um receive path: without it the checksum would be completed over the unreceived tail of the buffer virtio_net: parse tunnel csum_start little-endian - bugfix, a dependency of validating the header net: resolve uncommon partial checksums at ingress - fix itself net: add a sysctl to opt out of virtio net hdr checksum validation - reducing risk of the fix by adding a sysctl to disable it These are cleanups, can be deferred to net-next, too: net: add ip4_parse() virtio_net: cleanup protocol calculation - cleanup resulting code duplication (kept separate to simplify backporting) Fixes: f43798c27684 ("tun: Allow GSO using virtio_net_hdr") Changes since v1: - reorder patches to fix bisectability, addressing a comment by Björn Töpel. - code refactoring, different patch splitup, a sysctl knob to disable as suggested by Willem de Bruijn. - fix a bunch of minor issues spotted by LLMs Changes since v2: virtio_net: parse tunnel csum_start little-endian - new patch. correctly parsing the header is a dependency of validating it, otherwise i do not know what to validate net: account for ingress-resolved virtio net hdr state - make rx_csum_sw counter 64 bit so it won't wrap (spotted by LLM review) net: resolve uncommon partial checksums at ingress - tunnel fixes to bugs noticed by Willem de Bruijn and Chris Arges - restore the csum_offset checks as suggested by Willem net: add a sysctl to opt out of virtio net hdr checksum validation - the knob is no longer writable by root inside a user namespace: changing it now requires capable(CAP_NET_ADMIN) suggested by Willem de Bruijn net: add ip4_parse() - comment converted to kernel-doc format (Willem de Bruijn) um: vector: trim skbs before verifying the header - new patch, found by code review Changes since v3: net: account for ingress-resolved virtio net hdr state - um: vector: honor virtio net hdr conversion failures folded in (Björn Töpel) - count on tap and virtio_net, too (Willem de Bruijn) net: resolve uncommon partial checksums at ingress - walk the frame on loopback, too: loopback_xmit() runs eth_type_trans() on it (Willem de Bruijn) - return the mismatch handling directly, GSO is implied in the tunnel path so drop there outright, and fold the helper into its one remaining caller (Willem de Bruijn) - read the IP version through struct iphdr (Willem de Bruijn) - document the ipv6_find_hdr() flags choice net: add a sysctl to opt out of virtio net hdr checksum validation - renamed to virtio_net_hdr_validate, in case more validation is gated by the same knob later (Willem de Bruijn) - point .data at the value like the neighboring entries, the per-netns registration rebases it, and the handler reads the value directly - no ctl_table copy (Björn Töpel, Willem de Bruijn) - check the opt-out before parsing: with the knob off, packets the parser cannot handle were still dropped (Willem de Bruijn) - include virtio_net.h in net/core/dev.c so the static key definition sees its declaration (build warning reported by Jakub Kicinski) net: add ip4_parse() - add the missing kernel-doc Return: section (Jakub Kicinski) Changes since v4: net: account for ingress-resolved virtio net hdr state - count on tun only: dropped the tap, macvtap, ipvtap and virtio_net counters (Willem de Bruijn) - the driver side branches are in their final form here now, moved from "net: resolve uncommon partial checksums at ingress" (Willem de Bruijn) net: resolve uncommon partial checksums at ingress - no longer touches the drivers (Willem de Bruijn) - a packet too small to be GSO: ignore the tunnel GSO request, same as plain GSO ones, and complete wild metadata in place (sashiko) - document the zero copy interaction (sashiko) - honor a preset skb->protocol on ethernet: the stack uses it, except on loopback which re-parses the frame (sashiko) net: add a sysctl to opt out of virtio net hdr checksum validation - document the netns lifetime requirement (sashiko) net: add ip4_parse() - pull the whole header, options included, so that the transport header offset is within the linear data (Willem de Bruijn) Tested: full suite on the final tree, tunnel included. um part compiled only. Michael S. Tsirkin (7): net: account for ingress-resolved virtio net hdr state um: vector: trim skbs before verifying the header virtio_net: parse tunnel csum_start little-endian net: resolve uncommon partial checksums at ingress net: add a sysctl to opt out of virtio net hdr checksum validation net: add ip4_parse() virtio_net: cleanup protocol calculation Documentation/admin-guide/sysctl/net.rst | 19 ++ arch/um/drivers/vector_kern.c | 6 +- arch/um/drivers/vector_transports.c | 4 +- drivers/net/tap.c | 4 +- drivers/net/tun.c | 41 +++- drivers/net/virtio_net.c | 2 +- include/linux/ip.h | 37 +++ include/linux/virtio_net.h | 287 ++++++++++++++++++++++- include/net/netns/core.h | 1 + net/bridge/br_netfilter_hooks.c | 15 +- net/core/dev.c | 7 + net/core/net_namespace.c | 1 + net/core/sysctl_net_core.c | 50 ++++ net/ipv4/ip_input.c | 13 +- net/ipv4/netfilter/nf_reject_ipv4.c | 13 +- net/packet/af_packet.c | 4 +- 16 files changed, 461 insertions(+), 43 deletions(-) -- MST