projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4d57254
d005fbb
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
author
David S. Miller
<davem@davemloft.net>
Sun, 5 Jul 2020 00:47:35 +0000
(17:47 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sun, 5 Jul 2020 00:47:35 +0000
(17:47 -0700)
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>
Trivial merge