From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net 0/9,v2] Netfilter fixes for net
Date: Fri, 6 Aug 2021 17:11:40 +0200 [thread overview]
Message-ID: <20210806151149.6356-1-pablo@netfilter.org> (raw)
Hi,
The following patchset contains Netfilter fixes for net:
1) Restrict range element expansion in ipset to avoid soft lockup,
from Jozsef Kadlecsik.
2) Memleak in error path for nf_conntrack_bridge for IPv4 packets,
from Yajun Deng.
3) Simplify conntrack garbage collection strategy to avoid frequent
wake-ups, from Florian Westphal.
4) Fix NFNLA_HOOK_FUNCTION_NAME string, do not include module name.
5) Missing chain family netlink attribute in chain description
in nfnetlink_hook.
6) Incorrect sequence number on nfnetlink_hook dumps.
7) Use netlink request family in reply message for consistency.
8) Remove offload_pickup sysctl, use conntrack for established state
instead, from Florian Westphal.
9) Translate NFPROTO_INET/ingress to NFPROTO_NETDEV/ingress, since
NFPROTO_INET is not exposed through nfnetlink_hook.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
v2: This batch includes the missing rcu_read_unlock() for patch 3/9.
Thanks!
----------------------------------------------------------------
The following changes since commit c7d102232649226a69dddd58a4942cf13cff4f7c:
Merge tag 'net-5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2021-07-30 16:01:36 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 269fc69533de73a9065c0b7971bcd109880290b3:
netfilter: nfnetlink_hook: translate inet ingress to netdev (2021-08-06 17:07:41 +0200)
----------------------------------------------------------------
Florian Westphal (2):
netfilter: conntrack: collect all entries in one cycle
netfilter: conntrack: remove offload_pickup sysctl again
Jozsef Kadlecsik (1):
netfilter: ipset: Limit the maximal range of consecutive elements to add/delete
Pablo Neira Ayuso (5):
netfilter: nfnetlink_hook: strip off module name from hookfn
netfilter: nfnetlink_hook: missing chain family
netfilter: nfnetlink_hook: use the sequence number of the request message
netfilter: nfnetlink_hook: Use same family as request message
netfilter: nfnetlink_hook: translate inet ingress to netdev
Yajun Deng (1):
netfilter: nf_conntrack_bridge: Fix memory leak when error
Documentation/networking/nf_conntrack-sysctl.rst | 10 ----
include/linux/netfilter/ipset/ip_set.h | 3 +
include/net/netns/conntrack.h | 2 -
include/uapi/linux/netfilter/nfnetlink_hook.h | 9 +++
net/bridge/netfilter/nf_conntrack_bridge.c | 6 ++
net/netfilter/ipset/ip_set_hash_ip.c | 9 ++-
net/netfilter/ipset/ip_set_hash_ipmark.c | 10 +++-
net/netfilter/ipset/ip_set_hash_ipport.c | 3 +
net/netfilter/ipset/ip_set_hash_ipportip.c | 3 +
net/netfilter/ipset/ip_set_hash_ipportnet.c | 3 +
net/netfilter/ipset/ip_set_hash_net.c | 11 +++-
net/netfilter/ipset/ip_set_hash_netiface.c | 10 +++-
net/netfilter/ipset/ip_set_hash_netnet.c | 16 +++++-
net/netfilter/ipset/ip_set_hash_netport.c | 11 +++-
net/netfilter/ipset/ip_set_hash_netportnet.c | 16 +++++-
net/netfilter/nf_conntrack_core.c | 71 ++++++++----------------
net/netfilter/nf_conntrack_proto_tcp.c | 1 -
net/netfilter/nf_conntrack_proto_udp.c | 1 -
net/netfilter/nf_conntrack_standalone.c | 16 ------
net/netfilter/nf_flow_table_core.c | 11 +++-
net/netfilter/nfnetlink_hook.c | 24 ++++++--
21 files changed, 151 insertions(+), 95 deletions(-)
next reply other threads:[~2021-08-06 15:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 15:11 Pablo Neira Ayuso [this message]
2021-08-06 15:11 ` [PATCH net 1/9] netfilter: ipset: Limit the maximal range of consecutive elements to add/delete Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 2/9] netfilter: nf_conntrack_bridge: Fix memory leak when error Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 3/9] netfilter: conntrack: collect all entries in one cycle Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 4/9] netfilter: nfnetlink_hook: strip off module name from hookfn Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 5/9] netfilter: nfnetlink_hook: missing chain family Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 6/9] netfilter: nfnetlink_hook: use the sequence number of the request message Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 7/9] netfilter: nfnetlink_hook: Use same family as " Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 8/9] netfilter: conntrack: remove offload_pickup sysctl again Pablo Neira Ayuso
2021-08-06 15:11 ` [PATCH net 9/9] netfilter: nfnetlink_hook: translate inet ingress to netdev Pablo Neira Ayuso
2021-08-06 22:33 ` [PATCH net 0/9,v2] Netfilter fixes for net Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210806151149.6356-1-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.