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

Browse source

Pablo Neira Ayuso says:

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

The following contain more Netfilter fixes for net:

1) syzbot warning in nfnetlink bind, from Florian.

2) Refetch conntrack after __nf_conntrack_confirm(), from Florian Westphal.

3) Move struct nf_ct_timeout back at the bottom of the ctnl_time, to
   where it before recent update, also from Florian.

4) Add NL_SET_BAD_ATTR() to nf_tables netlink for proper set element
   commands error reporting.
====================

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

...

This commit is contained in:

David S. Miller 2022-05-27 11:08:12 +01:00

parent 02ded5a173 b53c116642

commit 55919b32d1

4 changed files with 23 additions and 25 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

include/net/netfilter/nf_conntrack_core.h

View file

12

net/netfilter/nf_tables_api.c

View file

24

net/netfilter/nfnetlink.c

View file

5

net/netfilter/nfnetlink_cttimeout.c

View file