From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21A56257854; Thu, 28 May 2026 20:17:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999437; cv=none; b=uCvzlEPvLl3zJ5jDE/9Rs6lod/Cvnr1YAYVrZV1UqtFcLFrP2WRxzr59MgB6e6d++1gCjZtghWWj6StH46qqxXzQrBfsnrO3e4Oc4lEYwqLVxoiwdTuKY2Gfm/VmmFA0O4gZ39e3MHfiYoQ3dZkdBdCEZEjwpRF8AQ85ka9N29k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999437; c=relaxed/simple; bh=nVmv+1NWud19GX+UqlJMgjdOdp6IbQLYmebUPyhFQfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GndtEGu406XnZ/XXvfP3kG+O7vgeCfwYNxkDZZMSkFi8LGOFTrLudsahd6if9I2CVXSI1g25Gns9nUczqhX4eK5z8+Dt1I9a7iBtiqVpB0dDzOQLfpBfCtAOHo6uYskojcYKt9LXnlXAjx98GcLb9jcrwjPlwJf9dChTG2+YRMk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wkVKhhxS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wkVKhhxS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 863671F000E9; Thu, 28 May 2026 20:17:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999436; bh=qx5QfhBrGA/6y3x0XlRluEg1NEVXewVCPh+riD9DqjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wkVKhhxSMUEJagkauZmC/VGUZMQkfCoKS2iZ7X4XdH22x6/FbgJZSirszp03dzsnn mEoASh1dMcTJD6vyfBCzxikI+npppg/MSElyj5hdaMsrEBXRiiBwn290V5Qoy4FeoE RxagcYI7SIHLDgkbqkMrrnXahD5944KpxIzTb/8w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Zhengchuan Liang , Ren Wei , Pablo Neira Ayuso Subject: [PATCH 6.18 065/377] netfilter: ip6t_hbh: reject oversized option lists Date: Thu, 28 May 2026 21:45:03 +0200 Message-ID: <20260528194640.247067025@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhengchuan Liang commit 4322dcde6b4173c2d8e8e6118ed290794263bcc8 upstream. struct ip6t_opts stores at most IP6T_OPTS_OPTSNR option descriptors, but hbh_mt6_check() does not reject larger optsnr values supplied from userspace. Validate optsnr in the rule setup path so only match data that fits the fixed-size opts array can be installed. This follows the existing xtables pattern of rejecting invalid user-provided counts in checkentry() and keeps the packet matching path unchanged. `struct ip6t_opts` has a fixed `opts[IP6T_OPTS_OPTSNR]` array, where `IP6T_OPTS_OPTSNR` is 16, then off-by-one array access is possible: [ 137.924693][ T8692] UBSAN: array-index-out-of-bounds in ../net/ipv6/netfilter/ip6t_hbh.c:110:29 [ 137.926167][ T8692] index 16 is out of range for type '__u16 [16]' Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Zhengchuan Liang Signed-off-by: Ren Wei Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/ipv6/netfilter/ip6t_hbh.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/ipv6/netfilter/ip6t_hbh.c +++ b/net/ipv6/netfilter/ip6t_hbh.c @@ -168,6 +168,10 @@ static int hbh_mt6_check(const struct xt pr_debug("unknown flags %X\n", optsinfo->invflags); return -EINVAL; } + if (optsinfo->optsnr > IP6T_OPTS_OPTSNR) { + pr_debug("too many supported opts specified\n"); + return -EINVAL; + } if (optsinfo->flags & IP6T_OPTS_NSTRICT) { pr_debug("Not strict - not implemented");