From nobody Fri Jul 24 21:52:26 2026 Received: from mail-yx1-f44.google.com (mail-yx1-f44.google.com [74.125.224.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8271F3815D8 for ; Thu, 23 Jul 2026 23:38:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784849882; cv=none; b=BfWIuk80U2enhmIYidrAnA3MlH2VA7yd2C0l+hLp+3cajf/sA2pAfpA5S/oOmExqzjkM6Enk7QAtT25EA54mO9nCzQ/TycAmPZPTf24jrtwADO/JyLqP7QnZ6znmJItEeusnbRyV2pZvzI3wvFnLC0wQiIqC8gNezyR10w41gWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784849882; c=relaxed/simple; bh=UfQtJ/kp0gNRViuTO9YqrowKPyphLa7XBVMfCt6J8rc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=n5hYaDzCli1hDByA1H3I9A8c0JMbpSo9yUuZRowjWfu0AvvU3mbjZ4o0HU81iPmuL/TSTqzC8OW14iVPEMiaHc/c0bX0nRUs0EDtI7GmD3v6PGzYW74//SyOwCuGHF+tPTzdhq//Jj9OMVEKWTUTb84zbDPsPhbKVyxkyP0Beqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jv6JNC2X; arc=none smtp.client-ip=74.125.224.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jv6JNC2X" Received: by mail-yx1-f44.google.com with SMTP id 956f58d0204a3-6689f36ae56so1470925d50.3 for ; Thu, 23 Jul 2026 16:38:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784849880; x=1785454680; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=zFto45DI7j1DhybQGaSarDjXXaVDfX4JCACCXpmrTbI=; b=Jv6JNC2X6cmVph5TZo60kwbAxveKbr/t97SiomYNsrR2aG69nN8qSYoNiSuwcjhUGf uPay5jGEIlPkA4+hrZMFhUxg5X5kHiBnF2XfaD1JxfzevSJNgr8MxaBb2JOQhhbGfExY igNte8gfHkGC0ueUuyImdE2STXWS33OqdnBYhsGEJBMj2DkzIOlopb4972GHSLkDxtU5 emX05drdqq7YxU3rdb82OR2qjIfk6o8DsbwgutbnZShuz4ILU1FXqf34ZvEP3wxnoPo3 G8NwWHpR5ozomhJ6d3zkoG06RSY3tQQfIpiot1eBNegV7yFnWgWAxVrdo7LULAGo3YuK 00wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784849880; x=1785454680; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zFto45DI7j1DhybQGaSarDjXXaVDfX4JCACCXpmrTbI=; b=pVysE0ZI78nsAIIGdQHCJ8QyjTR7OSaYI/i6N7Z8JsyrjCpsh2UdeWRIYK30qfiw24 Jono7uzCJjoanhOm3ZTBNeXSsLS06W990fCTGLrHr/cJgANvv0pfpJimrsHq69YndL3k CVgsOnvQdd8kfu8DgIU6j09bVypVEjYnoGPmJMnKTaQGM0a4Ghqb5JNLgldQWNROKQJA TPwE23yFUXD4F6BEunasGeTCt3RWOX5hfPjgFmC5KfyQcUy8Wt3+2IyISBC+4ZEeiQo5 /GtDVv2Ef6SOPQ7xokggDhkGNTF5NAIXCh8Tsq9uxl/InViSA4CRnAQNZBeZLxqZgihb I/yw== X-Forwarded-Encrypted: i=1; AHgh+RpOtBJML9Mt94AGs/C40ZJO70QOEedT2pgc9NjguHaWGSkc4Y1ntSQsZyKm8wMhuCP05rQh3CNA81fP6pc=@vger.kernel.org X-Gm-Message-State: AOJu0YznS9SE5HTTBERv9EWlXC66E97wJAcIborP3J2YhzUDYBFGdyQk Xy2sawlyEdJFNq5uMq3i0IE26+r4BmzI4gOK5X8ARP92VsdNPR+RWplH X-Gm-Gg: AR+sD10qe9AlWnVyGht3ndT6aBgX7HfJ56XrN7MlO4yRUeXzhpjcIxVryrVkghtoEuT fvO7tlOJ6t5I3BNfT9bArfEbQ04z+oPFfFvQKujQiZzYGhDDn+6zgMmSY97a/OYnA0Zq5YsQyVm R9tP9d7kRJGoC4AFRFSPhKQQszLRoqS7/ssfLDPNynxJf4CC9Ex//x/FMCCptTJX9aj6Hvvkv/t IzK7DTvTsqyCSakKfqACBmtHxcMwM097BbOHPlUwwJXkeF8aeOoaJOyvzfKXfeXsXoIXxLX7gCd OzbGT9jtuNXwMcPyzLGFXAZl+l2tCSNXUtU8p2DKcr0m6tYCGv5WLnwNzFGGXD3JLDSx0or2fMd RcviL/SyujJTCQjMh7KN+vACEXWKUxD7QUYmSU5WalVFHDh9Z+q6gEuiM0OklYkrU9DjhIi7OA6 M+zZnrMcFZedu36mR2VXuYiU43UvQNBdrD795V9s8Ek/4273ZmA42w3399mFT/z1RJrmyfRAgok qsRtzf/NuiIxYHZ6R6kg9wO X-Received: by 2002:a05:690e:4894:10b0:667:8b90:2e61 with SMTP id 956f58d0204a3-668a50369cemr979969d50.109.1784849880355; Thu, 23 Jul 2026 16:38:00 -0700 (PDT) Received: from LAPTOP-83ECOPAB.f7a5e5c3-cab1-4810-bdbb-207cdd06de9e.globalsecureaccess.local ([136.55.173.105]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-668906da4c8sm4007169d50.11.2026.07.23.16.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 16:37:59 -0700 (PDT) From: "Cen Zhang (Microsoft)" To: aconole@redhat.com, echaudro@redhat.com, i.maximets@ovn.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org Cc: netdev@vger.kernel.org, dev@openvswitch.org, linux-kernel@vger.kernel.org, AutonomousCodeSecurity@microsoft.com, tgopinath@linux.microsoft.com, kys@microsoft.com, blbllhy@gmail.com Subject: [PATCH net v3] net/openvswitch: check Ethernet header length in key_extract() Date: Thu, 23 Jul 2026 19:37:57 -0400 Message-ID: <20260723233757.96356-1-blbllhy@gmail.com> X-Mailer: git-send-email 2.53.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" When a packet arrives on an ARPHRD_NONE device (e.g. TUN), ovs_flow_key_extract() trusts the user-provided skb->protocol field: if it is ETH_P_TEB, the packet is classified as MAC_PROTO_ETHERNET and key_extract() is called without ensuring the skb has ETH_HLEN (14) bytes of linear data. key_extract() unconditionally pulls 2 * ETH_ALEN bytes for MAC addresses and parse_ethertype() pulls 2 more, either of which triggers a kernel BUG in __skb_pull() when the linear area is too small. kernel BUG at include/linux/skbuff.h:2848! RIP: 0010:key_extract+0xa7e/0xd90 net/openvswitch/flow.c:933 ovs_flow_key_extract+0x419/0xa70 ovs_vport_receive+0x222/0x390 netdev_frame_hook+0x3e0/0x630 tun_get_user+0x2d0c/0x38e0 Fixed by adding checks in key_extract() before pulling the Ethernet header. Fixes: 217ac77a3c25 ("openvswitch: allow L3 netdev ports") Reported-by: AutonomousCodeSecurity@microsoft.com Signed-off-by: Cen Zhang (Microsoft) --- v3: Use check_header() per review, fix format issue. v2: Moved the check into key_extract() per Ilya Maximets. Link: https://lore.kernel.org/all/20260721143602.64677-1-blbllhy@gmail.com net/openvswitch/flow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 66366982f604..fc4002353e17 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -911,6 +911,7 @@ static int key_extract_l3l4(struct sk_buff *skb, struct= sw_flow_key *key) static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) { struct ethhdr *eth; + int err; =20 /* Flags are always used as part of stats */ key->tp.flags =3D 0; @@ -926,6 +927,10 @@ static int key_extract(struct sk_buff *skb, struct sw_= flow_key *key) skb_reset_network_header(skb); key->eth.type =3D skb->protocol; } else { + err =3D check_header(skb, ETH_HLEN); + if (unlikely(err)) + return err; + eth =3D eth_hdr(skb); ether_addr_copy(key->eth.src, eth->h_source); ether_addr_copy(key->eth.dst, eth->h_dest); --=20 2.53.0