projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d57254 d005fbb)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Sun, 5 Jul 2020 00:47:35 +0000 (17:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 5 Jul 2020 00:47:35 +0000 (17:47 -0700)
commitc00e858d550c141169cde01c0d220d9eb21321a8
treeb82ea1774136956d2665f89d65e967e17b51cc5atree | snapshot
parent4d572545543e7b54d3f9721e54cb71d02d026209commit | diff
parentd005fbb855d3b5660d62ee5a6bd2d99c13ff8cf3commit | diff
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

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

The following patchset contains Netfilter fixes for net:

1) Use kvfree() to release vmalloc()'ed areas in ipset, from Eric Dumazet.

2) UAF in nfnetlink_queue from the nf_conntrack_update() path.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git