From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B2217155A30; Wed, 5 Feb 2025 15:07:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738768036; cv=none; b=WjjAFvqYGCwh2ZX4/h3/38QtzwEw6d/dTfj3VkaC9kDXgVfVnfqhWRC/QWCPbxXOXwH2kZrLmvRv1zzefeI3PZpGxNbuJSUUEkVVKo0hzkVhWu9RMFYkbOtTtY+6vgVtbe2ILTuq/4MhglfAew9ogDInI8uibvCt5Ucdn4PyOY8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738768036; c=relaxed/simple; bh=hRygtiYMDYqNINQGoqYeWIHeYNuD9H2yJBI5SmLuMes=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ERricIKQNJ/8Cp6Dswmgaj1xj2njr8GeFC4oFWpxJc+hWmMF8bCW1s40OReOWFoxqIPPVbNLPY0YqHOqRvhzNpT6oIZ6iRJ/o060WG/Kux0OHgXd49Cc8lEqqNdrM4S1utizUGdSJ7zIoVajZJCqg5nBjHPZnV8evqnRqsFmwrY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Wn5oneP0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Wn5oneP0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59615C4CED1; Wed, 5 Feb 2025 15:07:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738768036; bh=hRygtiYMDYqNINQGoqYeWIHeYNuD9H2yJBI5SmLuMes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wn5oneP0FP5CwVq9ZCrJkADQ81qYiTO+A9X1mM8xwdxVF6sJu4eQWAOHpz7zNdhCv FVDCsfnzACAJTCrkPxeMJD4hzqU8kP3PiO9RffFswhNRO/FuDg6i8Q0jRTgDrrWrFJ WsNWpbuxC9WMCWZkBAt4DcUFKh9CBoSpZLCXUGKs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Noam Rathaus , Florian Westphal , Pablo Neira Ayuso Subject: [PATCH 6.12 544/590] netfilter: nf_tables: reject mismatching sum of field_len with set key length Date: Wed, 5 Feb 2025 14:44:59 +0100 Message-ID: <20250205134516.084453829@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso commit 1b9335a8000fb70742f7db10af314104b6ace220 upstream. The field length description provides the length of each separated key field in the concatenation, each field gets rounded up to 32-bits to calculate the pipapo rule width from pipapo_init(). The set key length provides the total size of the key aligned to 32-bits. Register-based arithmetics still allows for combining mismatching set key length and field length description, eg. set key length 10 and field description [ 5, 4 ] leading to pipapo width of 12. Cc: stable@vger.kernel.org Fixes: 3ce67e3793f4 ("netfilter: nf_tables: do not allow mismatch field size and set key length") Reported-by: Noam Rathaus Reviewed-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_tables_api.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4968,7 +4968,7 @@ static int nft_set_desc_concat_parse(con static int nft_set_desc_concat(struct nft_set_desc *desc, const struct nlattr *nla) { - u32 num_regs = 0, key_num_regs = 0; + u32 len = 0, num_regs; struct nlattr *attr; int rem, err, i; @@ -4982,12 +4982,12 @@ static int nft_set_desc_concat(struct nf } for (i = 0; i < desc->field_count; i++) - num_regs += DIV_ROUND_UP(desc->field_len[i], sizeof(u32)); + len += round_up(desc->field_len[i], sizeof(u32)); - key_num_regs = DIV_ROUND_UP(desc->klen, sizeof(u32)); - if (key_num_regs != num_regs) + if (len != desc->klen) return -EINVAL; + num_regs = DIV_ROUND_UP(desc->klen, sizeof(u32)); if (num_regs > NFT_REG32_COUNT) return -E2BIG;