From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 16 May 2023 14:44:33 +0000 (+0200)
Subject: netfilter: nf_tables: stricter validation of element data
X-Git-Tag: baikal/aarch64/sdk5.10~53
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=773ef55f3cdad90cd16b4ec1b247d2b1e33c87da;p=kernel.git

netfilter: nf_tables: stricter validation of element data

[ bee06421687aba5401e8fb3735f3a63bbb6d0cbf ]

Make sure element data type and length do not mismatch the one specified
by the set declaration.

Fixes: 4969e2e898fb ("netfilter: nf_tables: variable sized set element keys / data")
Reported-by: Hugues ANGUELKOV <hanguelkov@randorisec.fr>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 8648b3ced6221..c82c4635c0a96 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -4315,13 +4315,20 @@ static int nft_setelem_parse_data(struct nft_ctx *ctx, struct nft_set *set,
 				  struct nft_data *data,
 				  struct nlattr *attr)
 {
+	u32 dtype;
 	int err;
 
 	err = nft_data_init(ctx, data, NFT_DATA_VALUE_MAXLEN, desc, attr);
 	if (err < 0)
 		return err;
 
-	if (desc->type != NFT_DATA_VERDICT && desc->len != set->dlen) {
+	if (set->dtype == NFT_DATA_VERDICT)
+		dtype = NFT_DATA_VERDICT;
+	else
+		dtype = NFT_DATA_VALUE;
+
+	if (dtype != desc->type ||
+	    set->dlen != desc->len) {
 		nft_data_release(data, desc->type);
 		return -EINVAL;
 	}