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

Commit 14662917 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: fix type in parsing in nf_tables_set_alloc_name() 



In nf_tables_set_alloc_name(), we are trying to find a new, unused
name for our new set and interate through the list of present sets.
As far as I can see, we're using format string %d to parse already
present names in order to mark their presence in a bitmap, so that
we can later on find the first 0 in that map to assign the new set
name to. We should rather use a temporary variable of type int to
store the result of sscanf() to, and for making sanity checks on.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d497c635

net/netfilter/nf_tables_api.c

+6 −3
Original line number Diff line number Diff line
@@ -1954,11 +1954,14 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, 
			return -ENOMEM;



		list_for_each_entry(i, &ctx->table->sets, list) {

			if (!sscanf(i->name, name, &n))

			int tmp;



			if (!sscanf(i->name, name, &tmp))

				continue;

			if (n < 0 || n > BITS_PER_LONG * PAGE_SIZE)

			if (tmp < 0 || tmp > BITS_PER_LONG * PAGE_SIZE)

				continue;

			set_bit(n, inuse);



			set_bit(tmp, inuse);

		}



		n = find_first_zero_bit(inuse, BITS_PER_LONG * PAGE_SIZE);