]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit - net/netfilter/x_tables.c
netfilter: x_tables: Use correct memory barriers.
authorMark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Fri, 9 Apr 2021 14:03:00 +0000 (16:03 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Apr 2021 16:32:04 +0000 (18:32 +0200)
commita88152f86ed701be02581e36fbd3abbc66a0c041
treea042b00d2bdc06b04a8f08013483faadb1b49ae2
parentf68dd061f5f09dfe1873183e1bef8250d4d53508
netfilter: x_tables: Use correct memory barriers.

CVE-2021-29650

When a new table value was assigned, it was followed by a write memory
barrier. This ensured that all writes before this point would complete
before any writes after this point. However, to determine whether the
rules are unused, the sequence counter is read. To ensure that all
writes have been done before these reads, a full memory barrier is
needed, not just a write memory barrier. The same argument applies when
incrementing the counter, before the rules are read.

Changing to using smp_mb() instead of smp_wmb() fixes the kernel panic
reported in cc00bcaa5899 (which is still present), while still
maintaining the same speed of replacing tables.

The smb_mb() barriers potentially slow the packet path, however testing
has shown no measurable change in performance on a 4-core MIPS64
platform.

Fixes: 7f5c6d4f665b ("netfilter: get rid of atomic ops in fast path")
Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 175e476b8cdf2a4de7432583b49c871345e4f8a1)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
include/linux/netfilter/x_tables.h
net/netfilter/x_tables.c