From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f43.google.com (mail-pj2-f43.google.com [74.125.227.171]) (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 44F96383C86 for ; Sat, 19 Sep 2026 21:06:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789851982; cv=none; b=igQwmjT+Z7G7ZfdE50t8vjFetYJHOUY+N51rqxkc6NljpvO1EL+t7y8sCNk0xF9tddfMu6SoGt5uqAhcWdJozCt8oGOTJxDWQiuG0nyiQ1U1ieRnq/29nJTXHWmZZujHqTB96VygkAMZ7s8zeEHchGAiI4hKS07f3gfQV8xK5r8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789851982; c=relaxed/simple; bh=xTAsRBwQetmXiS0TM8pGaLbfvMYZLQyBOBoEh5Rb2p0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VQkO8E+4+8Ku1ftyorGkzMWGij023lu8J/XIKnQzLYGOBgne7GdjSm+Ze69mYK9cIiu5/VSjelm/NP8Yt1RGVNNxzPzbtWYSsAI8Ftdz4BM4YQKFalJ723fHzoW0/QsAlkMbJDGKL1+g2XfFpc5BepNnHTU74FwlCfQM5HDs2eI= 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=kOxLWxer; arc=none smtp.client-ip=74.125.227.171 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="kOxLWxer" Received: by mail-pj2-f43.google.com with SMTP id 98e67ed59e1d1-39b31b4281eso1876637a91.2 for ; Sat, 19 Sep 2026 14:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789851981; x=1790456781; 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=VQo3syVkKE2lsVXDLjtQlNIZvvc+qy+7eQw8WhwcqWI=; b=kOxLWxerve2rnx55bTW89andJ0X5xgC0tVf53kSyocPSSx2hdADuBP4+w3ZfzL47Vr uh3XujmSZSvs+aua28f6gUI28tROfOECMjtt5SQQOf8280y4wN1hGQ1gjjICI0n40c8G oNbOiO1HiJpUwMwIk3789OjBD7ittCoM9lz/SSCUcm+Q+zFvGzWYxNaFIzYk97/rtaiw 0iGtFj4vwmOFmVDbdP9hoXJaxkX+z9MP9HFM2djkwO4fp4bT102V+69MxFYUDAuNnLO1 1KaiXsP+3k213sBwsBjWuDLSl/PcKiaTOF8KWU1VW/AkZwSyWDDYyVIUlvWj+yqqW637 SiQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789851981; x=1790456781; 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=VQo3syVkKE2lsVXDLjtQlNIZvvc+qy+7eQw8WhwcqWI=; b=MiE5AOVcmlBeABD1GvqTnHdxzL2D7qTftFqnmuWtkKcp4hMpxcwngA6Lzhuo0LUb0W Itsisq+Yrj6cKhb3DE41Y9hAO9yhLxZAP2tL3uQKGJyP4q2qoPJ6UnAPSB8uvLbjNDsg D43BRd9YzGQonuYnyRRZ3c056sTOGut9eFHqI4vzJA2ortMqL0kEndusnUpTNRr2IVlF XEawmtKIbpydUgp/afUtNeUIvsO2szGqAg5eRcTlCSWMrvbAnRPq9GHvVdcqrCl/4U6Q Hs26olIDjEb3z5M1OcWobwOaelPQiZ+Fl54PO62UOLevHhCKKDKm67AnYZF2LroSocUd mkeQ== X-Forwarded-Encrypted: i=1; AKwUvBx+gAP3TkfSII7z7ouAAWlxf6cF3/EpAgO4Oe1QFbloRDNpSGVw2FkTbyUDtu56M3xHozAEVQVxwKVRVgk=@vger.kernel.org X-Gm-Message-State: AFuF++nqD7CPX13SlIf47gYE671+20V86dDTQl5Q8Q6fLwOSHcarS2Dp UdZWoI7Af0gpPrJEA+P0jADykOSEwqEoM/hRv6WfEGIMWvZbH5d+WF6N X-Gm-Gg: AYBFou0gzlGlB3tyOxxv2U9MKg+LuBj8GznwfPXKBbp7Ll4CIRGMFn5M3VdhzmSpZpw oAvPE0rMZH9F7nBCmFsOHUTQ9oAnzn9+PwULj6unKL4DYUJEtHnuTmIyRG6UPuaG2DSixgMERJU x3+U8OrWf6zbQaiE4zOjvuITkFCmcmULTGPIKDRVKjzHXkpafWKKD5yYQZ0M+Je5WTEuSvwR9f2 rZsvHKGchkS4bJEk+0bpzy1M1TMChyejgchG33/oiScmP5Ep4ohF7rmIizAsTy5ICe+k0xp1S0t hgYshXzBFeDbmLcsYIaZIkeXQ2F9/PWU47JXCROFnIVWnePFreUoyAIhZYkj9+YwYKK1YiRAjd1 nCBrwVerraDW4LjxqK1K/1FzukpniVHL9TX5NfEy7J+mkjjOg6WX19BD1/se6doNoH8Z3R+qey0 7i5qavdNw2NkimmoaSy/s720P2t3angK9Sz6CDA0YthRH0o04rGs752z1v38proDkx+mxUeYJGV C/FqUJVUUtxqX7mUojLMOFC7fsc936mKibUuJ22vvk1+/RISqRBB8f1UcnSSYmr6hb7/Bwfj2BL MD/lmnMjbg== X-Received: by 2002:a17:90a:c089:b0:39e:6c68:c78d with SMTP id 98e67ed59e1d1-39e6c68caf1mr3686758a91.67.1789851980666; Sat, 19 Sep 2026 14:06:20 -0700 (PDT) Received: from phui-2.c.googlers.com.com (78.123.83.34.bc.googleusercontent.com. [34.83.123.78]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39e6ca50694sm6903246a91.2.2026.09.19.14.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Sep 2026 14:06:20 -0700 (PDT) From: Hui Peng To: steffen.klassert@secunet.com, herbert@gondor.apana.org.au, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] xfrm: input: fix 4-bit iph->ihl overflow and OOB read in xfrm4_remove_beet_encap() Date: Sat, 19 Sep 2026 21:06:19 +0000 Message-ID: <20260919210619.3029202-1-benquike@gmail.com> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In xfrm4_remove_beet_encap(), when the BEET pseudo-header is present (XFRM_MODE_SKB_CB(skb)->protocol == IPPROTO_BEETPH), two validation flaws exist in option decapsulation: 1. optlen is checked against `optlen > 250` instead of `MAX_IPOPTLEN` (40). Later, `iph->ihl += optlen / 4` adds up to 62 to the 4-bit `iph->ihl` field (which starts at 5), wrapping the 4-bit unsigned bitfield around 16 and producing a bogus IPv4 header length smaller than 20 bytes. 2. Only `pskb_may_pull(skb, phlen)` is checked before `__skb_pull(skb, phlen)` and `ip_fast_csum(skb_network_header(skb), iph->ihl)`. If the trailing `optlen` bytes reside in non-linear skb fragments (or beyond the packet), `ip_fast_csum()` reads `optlen` bytes past `skb_tail_pointer(skb)`. Cap `optlen` at `MAX_IPOPTLEN` (40) and ensure `pskb_may_pull(skb, phlen + optlen)` succeeds before pulling `phlen`. Fixes: 0a69452cb45a ("[XFRM]: BEET mode") Fixes: 227620e29509 ("[IPSEC]: Separate inner/outer mode processing on input") Assisted-by: LLM Signed-off-by: Hui Peng --- net/xfrm/xfrm_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 5ed87d51392a..3ed5fb0c755c 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -197,12 +197,12 @@ static int xfrm4_remove_beet_encap(struct xfrm_state *x, struct sk_buff *skb) phlen = sizeof(*ph) + ph->padlen; optlen = ph->hdrlen * 8 + (IPV4_BEET_PHMAXLEN - phlen); - if (optlen < 0 || optlen & 3 || optlen > 250) + if (optlen < 0 || optlen & 3 || optlen > MAX_IPOPTLEN) goto out; XFRM_MODE_SKB_CB(skb)->protocol = ph->nexthdr; - if (!pskb_may_pull(skb, phlen)) + if (!pskb_may_pull(skb, phlen + optlen)) goto out; __skb_pull(skb, phlen); } -- 2.55.0.1082.g2b9226bbc0-goog