| commit | c00e858d550c141169cde01c0d220d9eb21321a8 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Jul 04 17:47:35 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sat Jul 04 17:47:35 2020 -0700 |
| tree | b82ea1774136956d2665f89d65e967e17b51cc5a | |
| parent | 4d572545543e7b54d3f9721e54cb71d02d026209 [diff] | |
| parent | d005fbb855d3b5660d62ee5a6bd2d99c13ff8cf3 [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>