]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Jul 2017 13:02:22 +0000 (14:02 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Jul 2017 13:02:22 +0000 (14:02 +0100)
commitf745a54fb0ba4fe20c89b1cc238d3da50344c604
treef9b6920a31e51428d907b4a056c99186332b9f1d
parent52d3b85a48417e7f5138cab5b0f3cb52d7067ef9
parent7d62929679f006dc2d4e3e425c9e9b9ae161bce3
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two Netfilter fixes for your net tree,
they are:

1) Fix memleak from netns release path of conntrack protocol trackers,
   patch from Liping Zhang.

2) Uninitialized flags field in ebt_log, that results in unpredictable
   logging format in ebtables, also from Liping.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_proto_sctp.c