From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (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 156BC1F03DE for ; Tue, 17 Mar 2026 13:30:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773754224; cv=none; b=HiWjmwhDBmdxgTw4mfmkz0EilPlVIy/G/Dsse6Ode7LcoHgZt6z2SK97dHcj85sassOlnus0aLY5F6scRSg4Qa/TlROAT5godP39lhvmPj/P/Y3bRVNZYu0Dr8Wz8NIL2/mjMK7W3NPKs0SHSTCfqD9W/xHCLopg6nc9qIEvwAY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773754224; c=relaxed/simple; bh=WTklFd+xAu4hGzmNTuliFYPoc4TDU1mCc0XJBj9j7Ic=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: Mime-Version:Content-Type; b=iwCojUuXUd4Rf8k8kLuvB5IohNmVaRQrpFAWZHvsZhT/YaDFqHEKnGHmnrS5G1y2Ak7X/A4caXlKkn4GglImorAXy/P5Nrk7oJw29ZhBvum+mdI7o123xlCDUL2d8fJC8MQxGe6UFJ6fXyBDG/PFatTQP5JVzE43NgLFuvyPKXo= 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=dcay63gh; arc=none smtp.client-ip=209.85.128.170 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="dcay63gh" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-797ab169454so58185557b3.3 for ; Tue, 17 Mar 2026 06:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773754222; x=1774359022; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=o+OZHdz7JUIXbfLO4py8nXeTNKDtHpNLhBh45s0nxME=; b=dcay63ghRmUbcvLXKdLJlS+RJrvic4H2PSNKb0ztxbdB4pkFo2kKaw3Qk1nbIppe+I rFhSqt80K3+F8PdhvQVyLpiAZ1kS0p5pTXDuUiMnqwsqTYYoEDLFycvmltjewaxhYb87 VAKMefKwMAL9KUf1lpcjybKayzgoAxdUqg/Wp0cvbE1nQsTYHCkfapyxd7fjR9AKG862 qtr1Ha9mXF8nz3Pl5eyYW/2G5FZcPwS8ydAKPK8HXphVtdCD5I425K6Wh1QAQYV86Ymk ef9kpb0wSUVmWKHuToc0PEkyNYBIlqHsz7n+PLV2sk1OraYVl5aPVTspBzdSkj83EGme N9qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773754222; x=1774359022; h=content-transfer-encoding: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; bh=o+OZHdz7JUIXbfLO4py8nXeTNKDtHpNLhBh45s0nxME=; b=caBGtEfOddVN/SrscApyobXTvH9maA++KsPyH2ohVnVdVnEYqy0D6lpUdVpFtEt4HR sxJXM+weyMxNz5USijrTpJ9i2dYQcprILwYrEvfoobsD8wfq/U4LPxPJBJHpa4cx/gZZ OUffmVvEVE3xN5Oxgh8QEyPVbNFdyFsSokug7t6rMLc6LT4IpeZrXcPp+thABFp3qvub ZbjDazHhqtEMzvBwIjcp4qiO5A7UKCdFX7yA0vIberIV5jrQ6ZoGgyAUFQtvlHdoMYf4 jnTltwkaSHPKNqb3XyMPHNLEOEqdpE5U7hLCX+jmMN+OvMbEyoKDfq6vf2a8q3T2JYno PEDw== X-Forwarded-Encrypted: i=1; AJvYcCWlAH+Z9q+fMhggWr3jcswvpTQxVTWwjVk058jRXHcmOEIs7l86Fp6gsDKKT0QFh0dv2yFY7wZEHjMhycc=@vger.kernel.org X-Gm-Message-State: AOJu0YzrozcxnjW4+6dxe2OhxDUl7I6vU32pjdxnTtQtkFlUYCQtmIxJ oJRzAeB16tPwm+euCpIlw1Vez/eSS+vqBStENfPUPCaaXRth47NUYVxD X-Gm-Gg: ATEYQzy6krtotjdBqrzaTk8EUMyVMxzM48qBk0GuZcNT9qC1leotv6MiqvyzTUhnh9Y 05sj6Ev9zdB06H5/x+3Dsa18QnpujBAO8u43jtHly/SKEHAOjN95rCduXmtcn6zgNw6FCLwV6zO eZgddYGVgmfh1JDUBdyYqVtMdofU/FKoIDSUJaJ1robbTptZ/tw2WgZGHmpzUxkUAQZCXUXwCPI CDfsRvC9w10jwESYleJ1Q1UIyRwIj3qFzq/H2pF3wssdvZFHo86h12tQPOm4UdD7e1DmGd40YTn CrmXt9wB/7cGI1Od4F1oJzauY4IMyC5sA6MUPIsFd0hayP8ouFYBTqPr3kSH+xiEOJBYKSXb3/+ GoW0KC3C0CFqcVFDwaDE9obVr0VCBobEO/SmIJwlfVqqr+oKnDjRDMmLphyJbHtuUjes4C9kiNJ 2/f63qEe7ZnIUfkUD9vrampwYXAQXIr3CEDyFQIMzXHPQuYyDRRIeqegQelrR5VHvHXID931KFB aA2 X-Received: by 2002:a05:690c:84:b0:798:c349:7207 with SMTP id 00721157ae682-79a1c0ab6f1mr165122397b3.4.1773754221917; Tue, 17 Mar 2026 06:30:21 -0700 (PDT) Received: from gmail.com (180.134.85.34.bc.googleusercontent.com. [34.85.134.180]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-79a1688ca84sm78216867b3.48.2026.03.17.06.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 06:30:20 -0700 (PDT) Date: Tue, 17 Mar 2026 09:30:20 -0400 From: Willem de Bruijn To: Nick Hudson , bpf@vger.kernel.org Cc: Willem de Bruijn , Nick Hudson , Max Tottenham , Anna Glasgall , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: In-Reply-To: <20260317121429.2399539-5-nhudson@akamai.com> References: <20260317121429.2399539-1-nhudson@akamai.com> <20260317121429.2399539-5-nhudson@akamai.com> Subject: Re: [PATCH v1 4/5] bpf: add guard rails for new DECAP flags Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Nick Hudson wrote: > Add checks to require shrink-only decap, reject conflicting decap flag combinations, and verify removed length is sufficient for claimed header decapsulation. > > Co-developed-by: Max Tottenham > Signed-off-by: Max Tottenham > Co-developed-by: Anna Glasgall > Signed-off-by: Anna Glasgall > Signed-off-by: Nick Hudson This patch probably should come before 3, as 3 enables the features without the guard rails in place. > --- > net/core/filter.c | 45 ++++++++++++++++++++++++++++++++++++--------- > 1 file changed, 36 insertions(+), 9 deletions(-) > > diff --git a/net/core/filter.c b/net/core/filter.c > index ac7e1068fe4c..437e0da34f84 100644 > --- a/net/core/filter.c > +++ b/net/core/filter.c > @@ -56,6 +56,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -3745,20 +3746,46 @@ BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb, s32, len_diff, > return -ENOTSUPP; > } > > - if (flags & BPF_F_ADJ_ROOM_DECAP_L3_MASK) { > + if (flags & BPF_F_ADJ_ROOM_DECAP_MASK) { > + u32 len_decap_min = 0; > + > if (!shrink) > return -EINVAL; > > - switch (flags & BPF_F_ADJ_ROOM_DECAP_L3_MASK) { > - case BPF_F_ADJ_ROOM_DECAP_L3_IPV4: > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L3_MASK) == > + BPF_F_ADJ_ROOM_DECAP_L3_MASK) > + return -EINVAL; > + > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L4_MASK) == > + BPF_F_ADJ_ROOM_DECAP_L4_MASK) > + return -EINVAL; > + > + if ((flags & BPF_F_ADJ_ROOM_DECAP_IPXIP_MASK) == > + BPF_F_ADJ_ROOM_DECAP_IPXIP_MASK) > + return -EINVAL; > + Are these equality tests shorthand based on knowledge that each only have two options, so equality implies more than one option set? That is not obvious/self documenting. Please add a brief comment. > + if ((flags & BPF_F_ADJ_ROOM_DECAP_L4_MASK) && > + (flags & BPF_F_ADJ_ROOM_DECAP_IPXIP_MASK)) > + return -EINVAL; > + > + if (mode == BPF_ADJ_ROOM_MAC) > + len_decap_min += proto == htons(ETH_P_IP) ? > + sizeof(struct iphdr) : sizeof(struct ipv6hdr); MAC is not a GSO related decap, can be used for insertion/deletion of L2.5 headers. This should be dropped. > + > + if (flags & BPF_F_ADJ_ROOM_DECAP_L4_UDP) > + len_decap_min += sizeof(struct udphdr); > + > + if (flags & BPF_F_ADJ_ROOM_DECAP_L4_GRE) > + len_decap_min += sizeof(struct gre_base_hdr); > + > + if (len_diff_abs < len_decap_min) > + return -EINVAL; > + > + if (flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV4) > len_min = sizeof(struct iphdr); > - break; > - case BPF_F_ADJ_ROOM_DECAP_L3_IPV6: > + > + if (flags & BPF_F_ADJ_ROOM_DECAP_L3_IPV6) > len_min = sizeof(struct ipv6hdr); > - break; > - default: > - return -EINVAL; > - } > } > > len_cur = skb->len - skb_network_offset(skb); > -- > 2.34.1 >