Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorJakub Kicinski <kuba@kernel.org>
Wed, 3 Nov 2021 01:02:53 +0000 (18:02 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 3 Nov 2021 01:02:54 +0000 (18:02 -0700)
Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

1) Fix mac address UAF reported by KASAN in nfnetlink_queue,
   from Florian Westphal.

2) Autoload genetlink IPVS on demand, from Thomas Weissschuh.

* git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf:
  ipvs: autoload ipvs on genl access
  netfilter: nfnetlink_queue: fix OOB when mac header was cleared
====================

Link: https://lore.kernel.org/r/20211101221528.236114-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
net/netfilter/ipvs/ip_vs_ctl.c

Simple merge