Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 476c617e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: disallow element updates of bound anonymous sets 



[ Upstream commit c88c535b592d3baeee74009f3eceeeaf0fdd5e1b ]

Anonymous sets come with NFT_SET_CONSTANT from userspace. Although API
allows to create anonymous sets without NFT_SET_CONSTANT, it makes no
sense to allow to add and to delete elements for bound anonymous sets.

Fixes: 96518518 ("netfilter: add nftables")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d3b11039

net/netfilter/nf_tables_api.c

+5 −2
Original line number Diff line number Diff line
@@ -4804,7 +4804,8 @@ static int nf_tables_newsetelem(struct net *net, struct sock *nlsk, 
	if (IS_ERR(set))

		return PTR_ERR(set);



	if (!list_empty(&set->bindings) && set->flags & NFT_SET_CONSTANT)

	if (!list_empty(&set->bindings) &&

	    (set->flags & (NFT_SET_CONSTANT | NFT_SET_ANONYMOUS)))

		return -EBUSY;



	nla_for_each_nested(attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS], rem) {
@@ -4987,7 +4988,9 @@ static int nf_tables_delsetelem(struct net *net, struct sock *nlsk, 
	set = nft_set_lookup(ctx.table, nla[NFTA_SET_ELEM_LIST_SET], genmask);

	if (IS_ERR(set))

		return PTR_ERR(set);

	if (!list_empty(&set->bindings) && set->flags & NFT_SET_CONSTANT)



	if (!list_empty(&set->bindings) &&

	    (set->flags & (NFT_SET_CONSTANT | NFT_SET_ANONYMOUS)))

		return -EBUSY;



	if (nla[NFTA_SET_ELEM_LIST_ELEMENTS] == NULL) {