Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 DA2AD33B6D9 for ; Tue, 4 Aug 2026 12:16:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785845801; cv=none; b=o1TEUAsp+eS1tFv1iVzzAml1DlJUuYWeIPGwrVNBV6Wsgcm5j6IChoj9rwMVl57elYJvvHjkY9zSj9oiv0tmqePwCBj9xHtETLZuQbfFPqzftGC3Hi5dbqqWBICeU8ZmzGmkJfynjAMMYACBhaSlMs/+1KbkNOL3O+hQdpQ99n0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785845801; c=relaxed/simple; bh=bklSOIvEO6ydtChVkoQV9BjzbbdWhS+ESNcqx1MZvzE=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=FUv26EzXzhnhxIxY0LSaDPwtYoeZk2soCxE0xOOJ82bpn3x/TECQXM7jm3WBAzZnNj2SD1qfaZ3ybphV0WlICbhyofn7UCRid8DS2HA+/+Lou9a4SRYKsTuJ2+6mFhga6aT5JO7qWmXwbvDalQcPBDDtd2LknX9cFkbkMTn67xY= 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=Z0PaeMVz; arc=none smtp.client-ip=209.85.128.181 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="Z0PaeMVz" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-8200b55dc47so10372337b3.3 for ; Tue, 04 Aug 2026 05:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785845797; x=1786450597; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:subject :references:in-reply-to:message-id:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=3WZH5i3Rn0Miw5AIdlaT1MFKoD8HfWrkPOLXr3/e2mM=; b=Z0PaeMVzfUSvVYc4ajX07y9SzmpB+myLqRO1cMY7zr7oQQG2NQIrXNshLSTqyyJEXf Q6ciaDxsc0rZrdhBeTeGrrH9mF2WZqidjcQvhnWUjIBFql/vY752Ej2aDarvRTXFgs9Y uwNAtDG4vlcJeJzHJDXbio1lky2b0YLb/4oC6hamjonXbkuQxR3WX1TOiTJy9O+8avgm R+WAnXO7r4vcR93Br4Em6bxJhJIqUJwMH5oE7DZ+Nk6t3C4L3BPrmua7njAg1U304d5E ehlGIv/4cys+Cv+N4XYT6LbkneSm04Ek61+WFkL94j6xiHl+9Racv2/yQfGQ9GLDL3uH yobQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785845797; x=1786450597; h=content-transfer-encoding:content-type:mime-version:subject :references:in-reply-to:message-id:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=3WZH5i3Rn0Miw5AIdlaT1MFKoD8HfWrkPOLXr3/e2mM=; b=csIuFFskbS6ciTMouKqsiRwcR0y1dj3BT4hqCd//XhJsIQ/v8cU/NwKlNmweS4K2et 2ku7FacBFIXnd7DItaA4t363QWBgkjSc2DtrEOVOIfX6saD6tAoeY5/HdPwo8kBEiJLt GqIECqTH3pPkl6DkQ0+sOkzloEijJ3+UUokX3pNF5sP8ZEmU/5s5D0K0EVeMlIrVdkRd gbZWc+SU1L+ZYA220ecvCc2EJ57TvcbIbMXQZ37HWWYqqXHlcySj9WCNc7p/0Ur9vxmJ iqUZtnAfEEA8OA1JMXKdg/jXQQ4zCfwr3FLd22AXSnzeI6FeIQ3gQFYoM/WffiZnf+cZ HTTA== X-Forwarded-Encrypted: i=1; AHgh+Rpa2YKxopbC07QTQnA04DtBTUJADfUcB+i+oQsc3W29Yuo2SERqBRN9HbNoMfmpetYlEPqhiPg=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9bos60KIZyTuVdtj4oEMbP75fHTt4BoN4M4K4sqTC2RLjGFBo Pf/DMsVCIg1JUo4oH16t53FPVVK3R5GYZxh/B7byDFCLuTUAXz9QRyX+ X-Gm-Gg: AR+sD13RzjYxVOj4cwYADULM8UkisgunhBVVnczDHO+vVHpCeH0WwJ5t7u5QvoPP3I7 xcv1ZPvCzmmKlqYn9lUS92S1UBy0zMMIYJMPIuIqfBYTDU80198WL3q0gu6A90I4VJWH9PvNBYj RmhYERde3Jf9ailDHPyZZNDm8Wh0zlJnuKvgzLxx1GBOChb/zqEbg5w7g1myC9ptJ+NT9vQfYlL Fc69qDgY7IQ4nVZycLpaO7uRETiw8obSzdd8DCMsUcfUZ9nP+agjqNbuT0F1SYFpgPGCdIn45Ft QAYH7Mvluy1tAOm19BnsZJ6tSHY+fOuQ2AsmyxETiRfkr5YhkF0zsuGfVzPcQQSHGI4K/9D+r3Z 3i+3HWbhmKRPLNZzEQEfuIAD3AB7OLRXlvIgtxx/thkQ0m0YULsKZCdM9Qx14Wx5l4BYfMjVxJA 3qNUfYqjBH0SYg3BqQCQdeqq5i1ObJi1s4vze+l2IAtRzA9CD6lNLEjwEIRt3OQeJGDVhCclQqw jOjiQjiw4bDl3rsenXGi/2Hmddbud+YDhEl X-Received: by 2002:a05:690c:6b05:b0:80f:9998:e614 with SMTP id 00721157ae682-81fd4bc110emr162889387b3.28.1785845797150; Tue, 04 Aug 2026 05:16:37 -0700 (PDT) Received: from gmail.com (250.4.48.34.bc.googleusercontent.com. [34.48.4.250]) by smtp.gmail.com with ESMTPSA id 00721157ae682-820134d8ed2sm3812087b3.45.2026.08.04.05.16.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 05:16:36 -0700 (PDT) Date: Tue, 04 Aug 2026 08:16:35 -0400 From: Willem de Bruijn To: Qihang , netdev@vger.kernel.org Cc: willemdebruijn.kernel@gmail.com, willemb@google.com, daniel.zahka@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, stable@vger.kernel.org, Qihang Tang Message-ID: In-Reply-To: <20260804090016.33353-2-q.h.hack.winter@gmail.com> References: <20260730082925.93759-1-q.h.hack.winter@gmail.com> <20260804090016.33353-1-q.h.hack.winter@gmail.com> <20260804090016.33353-2-q.h.hack.winter@gmail.com> Subject: Re: [PATCH net v6 1/3] net: remove CAP_SYS_RAWIO zero-padding in dev_validate_header Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Qihang wrote: > From: Qihang Tang > > dev_validate_header() reads dev->hard_header_len directly when > zero-padding short link layer headers for CAP_SYS_RAWIO holders: > > if (capable(CAP_SYS_RAWIO)) { > memset(ll_header + len, 0, dev->hard_header_len - len); > return true; > } > > Packet send paths call dev_validate_header() on skbs whose headroom was > allocated from an earlier hard_header_len read. If the device is > reconfigured so that dev->hard_header_len increases before validation, > the memset writes past the reserved buffer, an out-of-bounds write. > > This out-of-bounds write is masked in some SOCK_RAW paths today because > the same concurrent increase can first make skb_push() exceed the > reserved headroom and trigger skb_under_panic(). Remove the zero-padding > branch before making those hard_header_len reads consistent, so the > snapshot fixes do not turn a loud panic into a silent overwrite. > > This path is only reached for variable length L2 protocols, where > len < hard_header_len but len >= min_header_len. No remaining in-tree > variable length L2 protocol implements header_ops->validate, and the > CAP_SYS_RAWIO bypass that zero-pads and accepts short headers has no > real value beyond allowing testing of intentionally malformed input. > > Drop the CAP_SYS_RAWIO branch. The remaining reads of > dev->hard_header_len in dev_validate_header() are comparisons only and > have no memory safety impact. > > Suggested-by: Willem de Bruijn > Fixes: 2793a23aacbd ("net: validate variable length ll headers") > Cc: stable@vger.kernel.org > Signed-off-by: Qihang Tang Reviewed-by: Willem de Bruijn For future patches: don't send new revisions as replies to existing threads.