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

Commit a3073c17 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: use nft_set_lookup_global from nf_tables_newsetelem() 



Replace opencoded implementation of nft_set_lookup_global() by call to
this function.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 10659cba

net/netfilter/nf_tables_api.c

+4 −11
Original line number Diff line number Diff line
@@ -4032,17 +4032,10 @@ static int nf_tables_newsetelem(struct net *net, struct sock *nlsk, 
	if (err < 0)

		return err;



	set = nf_tables_set_lookup(ctx.table, nla[NFTA_SET_ELEM_LIST_SET],

				   genmask);

	if (IS_ERR(set)) {

		if (nla[NFTA_SET_ELEM_LIST_SET_ID]) {

			set = nf_tables_set_lookup_byid(net,

					nla[NFTA_SET_ELEM_LIST_SET_ID],

					genmask);

		}

	set = nft_set_lookup_global(net, ctx.table, nla[NFTA_SET_ELEM_LIST_SET],

				    nla[NFTA_SET_ELEM_LIST_SET_ID], genmask);

	if (IS_ERR(set))

		return PTR_ERR(set);

	}



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

		return -EBUSY;