Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Browse source

Pablo Neira Ayusosays:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Memleak in commit audit error path, from Dongliang Mu.

2) Avoid possible false sharing for flowtable timeout updates
   and nft_last use.

3) Adjust conntrack timestamp due to garbage collection delay,
   from Florian Westphal.

4) Fix nft_nat without layer 3 address for the inet family.

5) Fix compilation warning in nfnl_hook when ingress support
   is disabled, from Arnd Bergmann.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2021-07-23 17:46:05 +01:00

parent 9986066d94 217e26bd87

commit 200bd5668c

6 changed files with 41 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

net/netfilter/nf_conntrack_core.c

View file

6

net/netfilter/nf_flow_table_core.c

View file

12

net/netfilter/nf_tables_api.c

View file

2

net/netfilter/nfnetlink_hook.c

View file

20

net/netfilter/nft_last.c

View file

4

net/netfilter/nft_nat.c

View file