Hi Pablo,
Please consider to pull the next patches for the nf-next tree:
- 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@xxxxxxxxxxxxx.
The patch covers all places in the source tree where
my kadlec@xxxxxxxxxxxxxxxxx address could be found.
If the patch needs to be splitted up, just let me know!
Best regards,
Jozsef
The following changes since commit 16e6427c88c5b7e7b6612f6c286d5f71d659e5be:
netfilter: ipv6: Fix undefined symbol nf_ct_frag6_gather (2019-06-06 11:52:59 +0200)
are available in the Git repository at:
git://blackhole.kfki.hu/nf-next fe03d4745675cbd678cb8
for you to fetch changes up to fe03d4745675cbd678cb8c50d951df0abafdcaee:
Update my email address (2019-06-10 13:00:24 +0200)
----------------------------------------------------------------
Aditya Pakki (1):
netfilter: ipset: fix a missing check of nla_parse
Florent Fourcot (2):
netfilter: ipset: remove useless memset() calls
netfilter: ipset: merge uadd and udel functions
Jozsef Kadlecsik (3):
netfilter: ipset: Fix the last missing check of nla_parse_deprecated()
netfilter: ipset: Fix error path in set_target_v3_checkentry()
Update my email address
Stefano Brivio (1):
ipset: Fix memory accounting for hash types on resize
CREDITS | 2 +-
MAINTAINERS | 2 +-
include/linux/jhash.h | 2 +-
include/linux/netfilter/ipset/ip_set.h | 2 +-
include/linux/netfilter/ipset/ip_set_counter.h | 2 +-
include/linux/netfilter/ipset/ip_set_skbinfo.h | 2 +-
include/linux/netfilter/ipset/ip_set_timeout.h | 2 +-
include/uapi/linux/netfilter/ipset/ip_set.h | 2 +-
net/ipv4/netfilter/iptable_raw.c | 2 +-
net/ipv4/netfilter/nf_nat_h323.c | 2 +-
net/ipv6/netfilter/ip6table_raw.c | 2 +-
net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +-
net/netfilter/ipset/ip_set_bitmap_ip.c | 4 +-
net/netfilter/ipset/ip_set_bitmap_ipmac.c | 4 +-
net/netfilter/ipset/ip_set_bitmap_port.c | 4 +-
net/netfilter/ipset/ip_set_core.c | 97 ++++++++++----------------
net/netfilter/ipset/ip_set_getport.c | 2 +-
net/netfilter/ipset/ip_set_hash_gen.h | 4 +-
net/netfilter/ipset/ip_set_hash_ip.c | 4 +-
net/netfilter/ipset/ip_set_hash_ipmark.c | 2 +-
net/netfilter/ipset/ip_set_hash_ipport.c | 4 +-
net/netfilter/ipset/ip_set_hash_ipportip.c | 4 +-
net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 +-
net/netfilter/ipset/ip_set_hash_mac.c | 4 +-
net/netfilter/ipset/ip_set_hash_net.c | 4 +-
net/netfilter/ipset/ip_set_hash_netiface.c | 4 +-
net/netfilter/ipset/ip_set_hash_netnet.c | 2 +-
net/netfilter/ipset/ip_set_hash_netport.c | 4 +-
net/netfilter/ipset/ip_set_hash_netportnet.c | 2 +-
net/netfilter/ipset/ip_set_list_set.c | 4 +-
net/netfilter/nf_conntrack_h323_main.c | 2 +-
net/netfilter/nf_conntrack_proto_tcp.c | 2 +-
net/netfilter/xt_iprange.c | 4 +-
net/netfilter/xt_set.c | 45 ++++++------
34 files changed, 104 insertions(+), 130 deletions(-)
