]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2eca98 021161b)
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)
commit3497aa7bb9b2c377c4f9b5e16c17950fb5efe184
treeb82ea1774136956d2665f89d65e967e17b51cc5atree | snapshot
parentf2eca98d5ca7eb94a9b3c3813caaac4269f32d92commit | diff
parent021161beba537482e8526d53460fe3ad641c9dcecommit | diff
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) 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>
Linux Kernel Source Tree.