Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Missing netlink attribute sanity check for NFTA_OSF_DREG,
from Florian Westphal.
2) Use bitmap infrastructure in ipset to fix KASAN slab-out-of-bounds
reads, from Jozsef Kadlecsik.
3) Missing initial CLOSED state in new sctp connection through
ctnetlink events, from Jiri Wiesner.
4) Missing check for NFT_CHAIN_HW_OFFLOAD in nf_tables offload
indirect block infrastructure, from wenxu.
5) Add __nft_chain_type_get() to sanity check family and chain type.
6) Autoload modules from the nf_tables abort path to fix races
reported by syzbot.
7) Remove unnecessary skb->csum update on inet_proto_csum_replace16(),
from Praveen Chaudhary.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/linux/netfilter/ipset/ip_set.h 0 additions, 7 deletionsinclude/linux/netfilter/ipset/ip_set.h
- include/linux/netfilter/nfnetlink.h 1 addition, 1 deletioninclude/linux/netfilter/nfnetlink.h
- include/net/netns/nftables.h 1 addition, 0 deletionsinclude/net/netns/nftables.h
- net/core/utils.c 17 additions, 3 deletionsnet/core/utils.c
- net/netfilter/ipset/ip_set_bitmap_gen.h 1 addition, 1 deletionnet/netfilter/ipset/ip_set_bitmap_gen.h
- net/netfilter/ipset/ip_set_bitmap_ip.c 3 additions, 3 deletionsnet/netfilter/ipset/ip_set_bitmap_ip.c
- net/netfilter/ipset/ip_set_bitmap_ipmac.c 3 additions, 3 deletionsnet/netfilter/ipset/ip_set_bitmap_ipmac.c
- net/netfilter/ipset/ip_set_bitmap_port.c 3 additions, 3 deletionsnet/netfilter/ipset/ip_set_bitmap_port.c
- net/netfilter/nf_conntrack_proto_sctp.c 3 additions, 3 deletionsnet/netfilter/nf_conntrack_proto_sctp.c
- net/netfilter/nf_tables_api.c 107 additions, 48 deletionsnet/netfilter/nf_tables_api.c
- net/netfilter/nf_tables_offload.c 1 addition, 1 deletionnet/netfilter/nf_tables_offload.c
- net/netfilter/nfnetlink.c 3 additions, 3 deletionsnet/netfilter/nfnetlink.c
- net/netfilter/nft_osf.c 3 additions, 0 deletionsnet/netfilter/nft_osf.c
Loading
Please register or sign in to comment