diff options
author | Paolo Abeni <pabeni@redhat.com> | 2024-04-18 14:12:36 +0300 |
---|---|---|
committer | Paolo Abeni <pabeni@redhat.com> | 2024-04-18 14:12:37 +0300 |
commit | ac1a21db32eda8a09076bad025d7b848dd086d28 (patch) | |
tree | 0b5d86138ccb91b73e20d24a196f3469809c42fe /drivers | |
parent | d10a7f551ecee6885095fc96aabcfbf959d4a256 (diff) | |
parent | 86a1471d7cde792941109b93b558b5dc078b9ee9 (diff) | |
download | linux-ac1a21db32eda8a09076bad025d7b848dd086d28.tar.xz |
Merge tag 'nf-24-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
Patch #1 amends a missing spot where the set iterator type is unset.
This is fixing a issue in the previous pull request.
Patch #2 fixes the delete set command abort path by restoring state
of the elements. Reverse logic for the activate (abort) case
otherwise element state is not restored, this requires to move
the check for active/inactive elements to the set iterator
callback. From the deactivate path, toggle the next generation
bit and from the activate (abort) path, clear the next generation
bitmask.
Patch #3 skips elements already restored by delete set command from the
abort path in case there is a previous delete element command in
the batch. Check for the next generation bit just like it is done
via set iteration to restore maps.
netfilter pull request 24-04-18
* tag 'nf-24-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
netfilter: nf_tables: fix memleak in map from abort path
netfilter: nf_tables: restore set elements when delete set fails
netfilter: nf_tables: missing iterator type in lookup walk
====================
Link: https://lore.kernel.org/r/20240418010948.3332346-1-pablo@netfilter.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions