Commit 2e917d60 authored Sep 12, 2016 by Liping Zhang Committed by Pablo Neira Ayuso Sep 12, 2016

netfilter: nft_numgen: fix race between num generate and store it



After we generate a new number, we still use the priv->counter and
store it to the dreg. This is not correct, another cpu may already
change it to a new number. So we must use the generated number, not
the priv->counter itself.

Fixes: 91dbc6be ("netfilter: nf_tables: add number generator expression")
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 8e8118f8

net/netfilter/nft_numgen.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ static void nft_ng_inc_eval(const struct nft_expr *expr,
		nval = (oval + 1 < priv->modulus) ? oval + 1 : 0;
		} while (atomic_cmpxchg(&priv->counter, oval, nval) != oval);

		memcpy(&regs->data[priv->dreg], &priv->counter, sizeof(u32));
		regs->data[priv->dreg] = nval;
		}

		static const struct nla_policy nft_ng_policy[NFTA_NG_MAX + 1] = {

Admin message