MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 18:05:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

netfilter: nft_counter: Disable BH in nft_counter_offload_stats().

Browse Source 
[ Upstream commit 1eacdd71b3 ]

The sequence counter nft_counter_seq is a per-CPU counter. There is no
lock associated with it. nft_counter_do_eval() is using the same counter
and disables BH which suggest that it can be invoked from a softirq.
This in turn means that nft_counter_offload_stats(), which disables only
preemption, can be interrupted by nft_counter_do_eval() leading to two
writer for one seqcount_t.
This can lead to loosing stats or reading statistics while they are
updated.

Disable BH during stats update in nft_counter_offload_stats() to ensure
one writer at a time.

Fixes: b72920f6e4 ("netfilter: nftables: counter hardware offload support")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sebastian Andrzej Siewior 2024-08-20 09:54:30 +02:00 committed by Greg Kroah-Hartman
parent 00425508f3
commit b1ac83483e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nft_counter.c
View File

@ -265,7 +265,7 @@ static void nft_counter_offload_stats(struct nft_expr *expr,
struct nft_counter *this_cpu; struct nft_counter *this_cpu;
seqcount_t *myseq; seqcount_t *myseq;
preempt_disable(); local_bh_disable();
this_cpu = this_cpu_ptr(priv->counter); this_cpu = this_cpu_ptr(priv->counter);
myseq = this_cpu_ptr(&nft_counter_seq); myseq = this_cpu_ptr(&nft_counter_seq);
@ -273,7 +273,7 @@ static void nft_counter_offload_stats(struct nft_expr *expr,
this_cpu->packets += stats->pkts; this_cpu->packets += stats->pkts;
this_cpu->bytes += stats->bytes; this_cpu->bytes += stats->bytes;
write_seqcount_end(myseq); write_seqcount_end(myseq);
preempt_enable(); local_bh_enable();
} }
void nft_counter_init_seqcount(void) void nft_counter_init_seqcount(void)