Skip to content

Netfilter fixes for net

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest10 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10netfilter: ingress: don't use nf_hook_list_activeinclude/linux/netfilter_ingress.h+6 -30 replies
2/10netfilter: ingress: fix wrong input interface on hookinclude/linux/netfilter_ingress.h+2 -20 replies
3/10netfilter: ipset: Fix extension alignmentinclude/linux/netfilter/ipset/ip_set.h net/netfilter/ipset/ip_set_bitmap_gen.h net/netfilter/ipset/ip_set_bitmap_ip.c +5 more+65 -800 replies
4/10netfilter: ipset: Fix hash:* type expirationnet/netfilter/ipset/ip_set_hash_gen.h+1 -10 replies
5/10netfilter: ipset: Fix hash type expire: release empty hash bucket blocknet/netfilter/ipset/ip_set_hash_gen.h+9 -40 replies
6/10netfilter: Fix removal of GRE expectation entries created by PPTPnet/ipv4/netfilter/nf_nat_pptp.c+1 -10 replies
7/10netfilter: nfnetlink_log: work around uninitialized variable warningnet/netfilter/nfnetlink_log.c+1 -10 replies
8/10netfilter: fix xt_TEE and xt_TPROXY dependenciesnet/netfilter/Kconfig+3 -30 replies
9/10net: add __netdev_alloc_pcpu_stats() to indicate gfp flagsinclude/linux/netdevice.h+15 -120 replies
10/10netfilter: nf_tables: add clone interface to expression operationsinclude/net/netfilter/nf_tables.h net/netfilter/nft_counter.c net/netfilter/nft_dynset.c+58 -120 replies

Reviews trailers per patch

1 of 10 patches has a Reviewed-by or Acked-by.

PatchGerhard WiesingerJozsef KadlecsikDavid S. Miller
1/10
2/10
3/10T-b T-b
4/10
5/10
6/10
7/10
8/10
9/10A-b
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 00/10] Netfilter fixes for net

Hi David,

The following patchset contains Netfilter fixes for your net tree. This large batch that includes fixes for ipset, netfilter ingress, nf_tables dynamic set instantiation and a longstanding Kconfig dependency problem. More specifically, they are:

1) Add missing check for empty hook list at the ingress hook, from Florian Westphal.

2) Input and output interface are swapped at the ingress hook, reported by Patrick McHardy.

3) Resolve ipset extension alignment issues on ARM, patch from Jozsef Kadlecsik.

4) Fix bit check on bitmap in ipset hash type, also from Jozsef.

5) Release buckets when all entries have expired in ipset hash type, again from Jozsef.

6) Oneliner to initialize conntrack tuple object in the PPTP helper, otherwise the conntrack lookup may fail due to random bits in the structure holes, patch from Anthony Lineham.

7) Silence a bogus gcc warning in nfnetlink_log, from Arnd Bergmann.

8) Fix Kconfig dependency problems with TPROXY, socket and dup, also from Arnd.

9) Add __netdev_alloc_pcpu_stats() to allow creating percpu counters from atomic context, this is required by the follow up fix for nf_tables.

10) Fix crash from the dynamic set expression, we have to add new clone operation that should be defined when a simple memcpy is not enough. This resolves a crash when using per-cpu counters with new Patrick McHardy's flow table nft support.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

Thanks!

----------------------------------------------------------------

The following changes since commit 212cd0895330b775f2db49451f046a5ca4e5704b:

selinux: fix random read in selinux_ip_postroute_compat() (2015-11-05 16:45:51 -0500)

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 086f332167d64b645d37405854f049b9ad7371ab:

netfilter: nf_tables: add clone interface to expression operations (2015-11-10 23:47:32 +0100)

----------------------------------------------------------------
Anthony Lineham (1):
netfilter: Fix removal of GRE expectation entries created by PPTP

Arnd Bergmann (2):
netfilter: nfnetlink_log: work around uninitialized variable warning
netfilter: fix xt_TEE and xt_TPROXY dependencies

Florian Westphal (1):
netfilter: ingress: don't use nf_hook_list_active

Jozsef Kadlecsik (3):
netfilter: ipset: Fix extension alignment
netfilter: ipset: Fix hash:* type expiration
netfilter: ipset: Fix hash type expire: release empty hash bucket block

Pablo Neira Ayuso (4):
netfilter: ingress: fix wrong input interface on hook Merge branch 'master' of git://blackhole.kfki.hu/nf
net: add __netdev_alloc_pcpu_stats() to indicate gfp flags
netfilter: nf_tables: add clone interface to expression operations

 include/linux/netdevice.h                 | 27 +++++++------
 include/linux/netfilter/ipset/ip_set.h    |  2 +-
 include/linux/netfilter_ingress.h         | 13 ++++---
 include/net/netfilter/nf_tables.h         | 16 +++++++-
 net/ipv4/netfilter/nf_nat_pptp.c          |  2 +-
 net/netfilter/Kconfig                     |  6 +--
 net/netfilter/ipset/ip_set_bitmap_gen.h   | 17 +++-----
 net/netfilter/ipset/ip_set_bitmap_ip.c    | 14 ++-----
 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 64 ++++++++++++++-----------------
 net/netfilter/ipset/ip_set_bitmap_port.c  | 18 ++++-----
 net/netfilter/ipset/ip_set_core.c         | 14 ++++---
 net/netfilter/ipset/ip_set_hash_gen.h     | 26 ++++++++-----
 net/netfilter/ipset/ip_set_list_set.c     |  5 ++-
 net/netfilter/nfnetlink_log.c             |  2 +-
 net/netfilter/nft_counter.c               | 49 +++++++++++++++++++----
 net/netfilter/nft_dynset.c                |  5 ++-
 16 files changed, 161 insertions(+), 119 deletions(-)