kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-14 05:55:17 +00:00
Code Issues Releases Packages Activity

Merge branch 'master' of git://blackhole.kfki.hu/nf-next

Browse source 
Jozsef Kadlecsik says:

====================
ipset patches for nf-next

- Remove useless memset() calls, nla_parse_nested/nla_parse
  erase the tb array properly, from Florent Fourcot.
- Merge the uadd and udel functions, the code is nicer
  this way, also from Florent Fourcot.
- Add a missing check for the return value of a
  nla_parse[_deprecated] call, from Aditya Pakki.
- Add the last missing check for the return value
  of nla_parse[_deprecated] call.
- Fix error path and release the references properly
  in set_target_v3_checkentry().
- Fix memory accounting which is reported to userspace
  for hash types on resize, from Stefano Brivio.
- Update my email address to kadlec@netfilter.org.
  The patch covers all places in the source tree where
  my kadlec@blackhole.kfki.hu address could be found.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2019-06-17 16:37:24 +02:00
commit 667ec21ebf
34 changed files with 104 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CREDITS
View file

2
MAINTAINERS
View file

2
include/linux/jhash.h
View file

2
include/linux/netfilter/ipset/ip_set.h
View file

2
include/linux/netfilter/ipset/ip_set_counter.h
View file

2
include/linux/netfilter/ipset/ip_set_skbinfo.h
View file

2
include/linux/netfilter/ipset/ip_set_timeout.h
View file

2
include/uapi/linux/netfilter/ipset/ip_set.h
View file

2
net/ipv4/netfilter/iptable_raw.c
View file

2
net/ipv4/netfilter/nf_nat_h323.c
View file

2
net/ipv6/netfilter/ip6table_raw.c
View file

2
net/netfilter/ipset/ip_set_bitmap_gen.h
View file

4
net/netfilter/ipset/ip_set_bitmap_ip.c
View file

4
net/netfilter/ipset/ip_set_bitmap_ipmac.c
View file

4
net/netfilter/ipset/ip_set_bitmap_port.c
View file

97
net/netfilter/ipset/ip_set_core.c
View file

2
net/netfilter/ipset/ip_set_getport.c
View file

4
net/netfilter/ipset/ip_set_hash_gen.h
View file

4
net/netfilter/ipset/ip_set_hash_ip.c
View file

2
net/netfilter/ipset/ip_set_hash_ipmark.c
View file

4
net/netfilter/ipset/ip_set_hash_ipport.c
View file

4
net/netfilter/ipset/ip_set_hash_ipportip.c
View file

4
net/netfilter/ipset/ip_set_hash_ipportnet.c
View file

4
net/netfilter/ipset/ip_set_hash_mac.c
View file

4
net/netfilter/ipset/ip_set_hash_net.c
View file

4
net/netfilter/ipset/ip_set_hash_netiface.c
View file

2
net/netfilter/ipset/ip_set_hash_netnet.c
View file

4
net/netfilter/ipset/ip_set_hash_netport.c
View file

2
net/netfilter/ipset/ip_set_hash_netportnet.c
View file

4
net/netfilter/ipset/ip_set_list_set.c
View file

2
net/netfilter/nf_conntrack_h323_main.c
View file

2
net/netfilter/nf_conntrack_proto_tcp.c
View file

4
net/netfilter/xt_iprange.c
View file

45
net/netfilter/xt_set.c
View file