From nobody Mon Jun 8 06:35:38 2026 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 DA5784071DA for ; Fri, 5 Jun 2026 19:46:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780688808; cv=none; b=EHge6PQ2d54OCHqiS80uITfTMwOCXsGLLeMjfy/UTqct++r9FBopOvr5eHwxhWXcv2cqwem6US0hNVkPAt17ZUERHGzJQ9lZGfZRJpGV2AKDZ+sGC/ECBZQKpSfdo9d52iSJS7GS9ux3NL37xNIUzmo8qpikPsrVxcRYZDA9uzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780688808; c=relaxed/simple; bh=I4BJujHHZUZqw6n+betSBc0+olYlvmBlXUXmbzBrl7g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XPGxqYDtwVIZiA2XGlKWq+Pl9Efym+KgmcXAE6kt8C1TURgnii2qJ7nNLjedmPS2m6XeBqSAogUvtMLRLnT4fJBtSnOaQ0ScmuXFWTIcMlxELcaD2LiwvFk9m+7XnzXr4Yt9cNE6N9Yqok6LA29f01LavcLLTxBWCXPiP9bdWoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=trailofbits.com; spf=pass smtp.mailfrom=trailofbits.com; dkim=pass (2048-bit key) header.d=trailofbits.com header.i=@trailofbits.com header.b=M12yxGjd; arc=none smtp.client-ip=209.85.222.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=trailofbits.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=trailofbits.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=trailofbits.com header.i=@trailofbits.com header.b="M12yxGjd" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-915767ea2d0so193424785a.1 for ; Fri, 05 Jun 2026 12:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trailofbits.com; s=google; t=1780688806; x=1781293606; 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; bh=QkwkhyiQDGQIbGWw1Mr8x2MZmKdl2kRdID6GKjvxF4g=; b=M12yxGjdAAiqiImH6CCOvssnZPHBETqmfKAkhCG22fwVZpVLtO1+UhZH6zXzpvy8Mb fm8ltSIss++FusPrYZ+XRyjjbMHzswlGRTsjF5VN7f9oEKnszuD3P1dPW/Tt8jsoasll vz81iWDFUyIJMmqCRDUhZ10qtYN3WJAXhCCA+mHpQ8Ln/d2Pd4cZFm40l1gLkCpeDIXM NCe6LgQhvaXR/qK66zSjzX08PWIo/Ldp2J3vDhgeb8czpga8EqkKM6INA/n359RpOIvJ eIFnRL+n6/pChM+u0mPI89c8dWo2fFcbHVmq58auQBS5mIuVxMt4jcIuiqBNWdllTYtB 35jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780688806; x=1781293606; 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; bh=QkwkhyiQDGQIbGWw1Mr8x2MZmKdl2kRdID6GKjvxF4g=; b=ZIpW/6LnAa0547oaEkA1t7Y7EYDgJu1X9C0R1n0jQJL/FLGpYWox0m/A5ybeqxRw+w rCPeMcsYF53N27L3YZRtrgxWLdhgIvS7V1LGSYfoArxkRiTatlrI4U1jYBQ6L6LZZvw9 7HQRjHRe/MUlySK6nsF4/l2ZLBufjxEnfXhjjH5kOE1IuUcsQg3oMPfgt1FJWTZfMKBQ o/Zmvh1VKywBrCrq2eSMsgDjcBig8T7Y/PwtK/la9JTUQmDyT23krAN75yPdYobWUyEi R/IxHuwitkN4hFVOKhXdPLTA9DINjHdFv1gkVrC0YRsj6EFwXoV/EybIP4gdmI51sLgm a3IA== X-Forwarded-Encrypted: i=1; AFNElJ/8nExj5+FkDjsgRhuHut9t9Mx/Fr18Mk/G+AgT0o/jcCX0hVUDUjI1UFDvbUIayeFJ9MJvVKaGjQ5exU0=@vger.kernel.org X-Gm-Message-State: AOJu0YyCWoLTFKSLNj7hchydIvtTIf+gHq4QSybkdPPeAupOZmWhwzlf PICTPrTHoJ3I6i7e1EmkRWLqFEV0SFA9esd6LHQGOlX3Rij81TakwT2H7HN7iqvZq18= X-Gm-Gg: Acq92OFOBTxS/h7pKQ3vEsDBged/coRp8P4aTKJzAkgLFsDEzK+OE+7APW3M4Uh60vV /Ckj61F2HGcSONC9qZ6xdm8Kc8RmgOupTBQPFZfcWAmsgcH0ngKWtk224BKAD0Z/MozWNL/D2dZ fV9N0K9Ky1LYBDB6eA7SH5vXIjHdHVB933x1nSj1saa/RmnhixO2a7uCHe2vtqmhAQDUpxzzikH qPOaVvYpj3d5dVpwDuJDKM/L2OxZQXYQbrpnkpO/hBw3rkXoqFbXRZWb+A/uvQ1aDvlSqClCIWL sPD1vQ9T5vq+M/+ZrZmIKNUYPZs+zCGk5VHqamZDbf5vN/gmFheyWjLMI3Mt17XAacu/RwVUQLC taZkH8BZ2Mpv27zkXtP+0teiWC/0omnLwS7BkjH5FPPtJh1CghfDOLBr40DK2YRxnOHwDHKFdDV /xnGXeo+5SFoTvxBIacvi2IotfA3OUT1+hm3z0HgtxiHlCuQkL X-Received: by 2002:a05:620a:25c6:b0:912:671b:d098 with SMTP id af79cd13be357-915a9dee09dmr926759785a.51.1780688805905; Fri, 05 Jun 2026 12:46:45 -0700 (PDT) Received: from localhost ([161.35.96.86]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-9158a37bcd6sm996117285a.25.2026.06.05.12.46.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jun 2026 12:46:45 -0700 (PDT) From: Samuel Moelius To: Jamal Hadi Salim Cc: Samuel Moelius , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netdev@vger.kernel.org (open list:TC subsystem), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] net/sched: act_pedit: require matching IPv4 L4 protocol Date: Fri, 5 Jun 2026 19:46:39 +0000 Message-ID: <20260605194640.2645386-1-sam.moelius@trailofbits.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 extended IPv4 L4 header mode in act_pedit can select TCP or UDP header fields without confirming that the IPv4 protocol field matches the selected transport header. That lets a rule written for TCP or UDP modify unrelated payload bytes in a packet carrying a different protocol. Verify the IPv4 protocol before applying TCP or UDP extended header edits. Assisted-by: Codex:gpt-5.5-cyber-preview Signed-off-by: Samuel Moelius --- net/sched/act_pedit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index bc20f08a2789..9a4590451f7e 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -341,6 +341,8 @@ static int pedit_l4_skb_offset(struct sk_buff *skb, int= *hoffset, const int head =20 if (!iph) goto out; + if (iph->ihl < 5 || iph->protocol !=3D header_type) + goto out; *hoffset =3D noff + iph->ihl * 4; ret =3D 0; break; --=20 2.43.0