Commit 63c94bff authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Ziyang Xuan
Browse files

netfilter: nf_tables: __nft_expr_type_get() selects specific family type 

stable inclusion
from stable-v4.19.313
commit 97f097a8091261ffa07c8889550c4026e59b6c14
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9L5P0


CVE: CVE-2024-27020

--------------------------------

[ Upstream commit 9cff126f ]

In case that there are two types, prefer the family specify extension.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: f969eb84ce48 ("netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
parent 7d91c9c7

net/netfilter/nf_tables_api.c

+8 −5
Original line number Diff line number Diff line
@@ -2034,14 +2034,17 @@ EXPORT_SYMBOL_GPL(nft_unregister_expr); 
static const struct nft_expr_type *__nft_expr_type_get(u8 family,

						       struct nlattr *nla)

{

	const struct nft_expr_type *type;

	const struct nft_expr_type *type, *candidate = NULL;



	list_for_each_entry(type, &nf_tables_expressions, list) {

		if (!nla_strcmp(nla, type->name) &&

		    (!type->family || type->family == family))

			return type;

		if (!nla_strcmp(nla, type->name)) {

			if (!type->family && !candidate)

				candidate = type;

			else if (type->family == family)

				candidate = type;

		}

	return NULL;

	}

	return candidate;

}



static const struct nft_expr_type *nft_expr_type_get(struct net *net,