Commit 9a583ad6 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Treehugger Robot
Browse files

UPSTREAM: netfilter: ipset: Fix race between namespace cleanup and gc in the list:set type



[ Upstream commit 4e7aaa6b ]

Lion Ackermann reported that there is a race condition between namespace cleanup
in ipset and the garbage collection of the list:set type. The namespace
cleanup can destroy the list:set type of sets while the gc of the set type is
waiting to run in rcu cleanup. The latter uses data from the destroyed set which
thus leads use after free. The patch contains the following parts:

- When destroying all sets, first remove the garbage collectors, then wait
  if needed and then destroy the sets.
- Fix the badly ordered "wait then remove gc" for the destroy a single set
  case.
- Fix the missing rcu locking in the list:set type in the userspace test
  case.
- Use proper RCU list handlings in the list:set type.

The patch depends on c1193d9b (netfilter: ipset: Add list flush to cancel_gc).

Bug: 347636817
Fixes: 97f7cf1c (netfilter: ipset: fix performance regression in swap operation)
Reported-by: default avatarLion Ackermann <nnamrec@gmail.com>
Tested-by: default avatarLion Ackermann <nnamrec@gmail.com>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 390b353d)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I92a8681d8a0f475aa20c34c17daa222d02cf7935
parent a916821b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment