Skip to content

Netfilter fixes for net

Pablo Neira Ayuso netdev netfilter-devel oe-kbuild-all 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5netfilter: nft_reject_bridge: enable reject with bridge vlannet/bridge/netfilter/nft_reject_bridge.c+6 -00 replies
2/5netfilter: ipset: Fix subcounter update skipnet/netfilter/ipset/ip_set_list_set.c+1 -10 replies
3/5netfilter: nf_conntrack_pptp: prevent buffer overflows in debug codeinclude/linux/netfilter/nf_conntrack_pptp.h net/ipv4/netfilter/nf_nat_pptp.c net/netfilter/nf_conntrack_pptp.c+38 -330 replies
4/5netfilter: conntrack: make conntrack userspace helpers work againnet/netfilter/nf_conntrack_core.c+72 -61 reply
5/5netfilter: nfnetlink_cthelper: unbreak userspace helper supportnet/netfilter/nfnetlink_cthelper.c+2 -10 replies

Reviews trailers per patch

2 of 5 patches have a Reviewed-by or Acked-by.

PatchFlorian Westphal
1/5
2/5
3/5
4/5R-b
5/5R-b

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 0/5] Netfilter fixes for net

Hi,

The following patchset contains Netfilter fixes for net:

1) Set VLAN tag in tcp reset/icmp unreachable packets to reject connections in the bridge family, from Michael Braun.

2) Incorrect subcounter flag update in ipset, from Phil Sutter.

3) Possible buffer overflow in the pptp conntrack helper, based on patch from Dan Carpenter.

4) Restore userspace conntrack helper hook logic that broke after hook consolidation rework.

5) Unbreak userspace conntrack helper registration via nfnetlink_cthelper.

You can pull these changes from:

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

Thank you.

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

The following changes since commit 98790bbac4db1697212ce9462ec35ca09c4a2810:

Merge tag 'efi-urgent-2020-05-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2020-05-24 10:24:10 -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 703acd70f2496537457186211c2f03e792409e68:

netfilter: nfnetlink_cthelper: unbreak userspace helper support (2020-05-25 20:39:14 +0200)

----------------------------------------------------------------
Michael Braun (1):
netfilter: nft_reject_bridge: enable reject with bridge vlan

Pablo Neira Ayuso (3):
netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code
netfilter: conntrack: make conntrack userspace helpers work again
netfilter: nfnetlink_cthelper: unbreak userspace helper support

Phil Sutter (1):
netfilter: ipset: Fix subcounter update skip

 include/linux/netfilter/nf_conntrack_pptp.h |  2 +-
 net/bridge/netfilter/nft_reject_bridge.c    |  6 +++
 net/ipv4/netfilter/nf_nat_pptp.c            |  7 +--
 net/netfilter/ipset/ip_set_list_set.c       |  2 +-
 net/netfilter/nf_conntrack_core.c           | 78 ++++++++++++++++++++++++++---
 net/netfilter/nf_conntrack_pptp.c           | 62 +++++++++++++----------
 net/netfilter/nfnetlink_cthelper.c          |  3 +-
 7 files changed, 119 insertions(+), 41 deletions(-)