Skip to content

netfilter: socket lookup function refactoring, cgroup match fixes

Daniel Mack netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3netfilter: factor out helpers from xt_socket into separate modulesinclude/linux/netfilter_ipv4.h include/linux/netfilter_ipv6.h net/ipv4/netfilter/Makefile +5 more+355 -2700 replies
2/3netfilter: x_tables: fix cgroup's NF_INET_LOCAL_IN sk lookupsnet/netfilter/Kconfig net/netfilter/xt_cgroup.c+79 -180 replies
3/3netfilter: nft_meta: fix cgroup socket lookupsnet/netfilter/Kconfig net/netfilter/nft_meta.c+34 -30 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by.

PatchDaniel Mack
1/3
2/3T-b
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH nf-next 0/3] netfilter: socket lookup function refactoring, cgroup match fixes

This series is based on work done by Daniel Borkmann a little while ago:

http://article.gmane.org/gmane.comp.security.firewalls.netfilter.devel/56877

I addressed the feedback from that thread and factored out the socket lookup code into own modules, one for ipv4, one for ipv6. These modules are now selected in kbuild by code that uses it.

Also, a patch was added to fix nft_meta cgroup match rules in a similar fashion as it's now done for xt_cgroup.

Feedback welcome!

Thanks,
Daniel

Daniel Borkmann (1):
netfilter: x_tables: fix cgroup's NF_INET_LOCAL_IN sk lookups

Daniel Mack (2):
netfilter: factor out helpers from xt_socket into separate modules
netfilter: nft_meta: fix cgroup socket lookups

 include/linux/netfilter_ipv4.h    |   6 +
 include/linux/netfilter_ipv6.h    |   5 +
 net/ipv4/netfilter/Makefile       |   3 +
 net/ipv4/netfilter/nf_sock_ipv4.c | 169 +++++++++++++++++++++++
 net/ipv6/netfilter/Makefile       |   3 +
 net/ipv6/netfilter/nf_sock_ipv6.c | 152 +++++++++++++++++++++
 net/netfilter/Kconfig             |  12 ++
 net/netfilter/nft_meta.c          |  35 ++++-
 net/netfilter/xt_cgroup.c         |  95 ++++++++++---
 net/netfilter/xt_socket.c         | 278 ++------------------------------------
 10 files changed, 467 insertions(+), 291 deletions(-)
 create mode 100644 net/ipv4/netfilter/nf_sock_ipv4.c
 create mode 100644 net/ipv6/netfilter/nf_sock_ipv6.c
Signature · 1 line
2.4.0