diff options
author | David S. Miller <davem@davemloft.net> | 2020-07-05 02:47:35 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-07-05 02:47:35 +0200 |
commit | c00e858d550c141169cde01c0d220d9eb21321a8 (patch) | |
tree | b82ea1774136956d2665f89d65e967e17b51cc5a /net/8021q/vlan_dev.c | |
parent | Merge branch 'Documentation-networking-eliminate-doubled-words' (diff) | |
parent | netfilter: conntrack: refetch conntrack after nf_conntrack_update() (diff) | |
download | linux-c00e858d550c141169cde01c0d220d9eb21321a8.tar.xz linux-c00e858d550c141169cde01c0d220d9eb21321a8.zip |
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>
Diffstat (limited to 'net/8021q/vlan_dev.c')
0 files changed, 0 insertions, 0 deletions