summaryrefslogtreecommitdiffstats
path: root/net/l3mdev
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-05-25 18:28:42 -0700
committerDavid S. Miller <davem@davemloft.net>2020-05-25 18:28:42 -0700
commit963bdfc75cfa20c53bde64928af57a6ca175fc01 (patch)
treeebe0a9180554a011eeec71c3b5e6003feff68c19 /net/l3mdev
parent1a6da4fcdd02d5cb2c1deaec1a5cc2b06efd2a4d (diff)
parent703acd70f2496537457186211c2f03e792409e68 (diff)
downloadlinux-963bdfc75cfa20c53bde64928af57a6ca175fc01.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net 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. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l3mdev')
0 files changed, 0 insertions, 0 deletions