Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

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/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>

diff --combined net/netfilter/ipvs/ip_vs_ctl.c
index e62b40bd349e22910e19a2241afeb97aa5ef97c7,0ff94c66641f4817ad3473fd81f8f598380b3cf8..38ed88b8900770659ebd65d5b8e4b34b264ce702
--- 1/net/netfilter/ipvs/ip_vs_ctl.c
--- 2/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -48,6 -48,8 +48,8 @@@
  
  #include <net/ip_vs.h>
  
+ MODULE_ALIAS_GENL_FAMILY(IPVS_GENL_NAME);
+ 
  /* semaphore for IPVS sockopts. And, [gs]etsockopt may sleep. */
  static DEFINE_MUTEX(__ip_vs_mutex);
  
@@@ -2017,12 -2019,6 +2019,12 @@@ static struct ctl_table vs_vars[] = 
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
 +      {
 +              .procname       = "run_estimation",
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec,
 +      },
  #ifdef CONFIG_IP_VS_DEBUG
        {
                .procname       = "debug_level",
@@@ -4096,8 -4092,6 +4098,8 @@@ static int __net_init ip_vs_control_net
        tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;
        tbl[idx++].data = &ipvs->sysctl_schedule_icmp;
        tbl[idx++].data = &ipvs->sysctl_ignore_tunneled;
 +      ipvs->sysctl_run_estimation = 1;
 +      tbl[idx++].data = &ipvs->sysctl_run_estimation;
  #ifdef CONFIG_IP_VS_DEBUG
        /* Global sysctls must be ro in non-init netns */
        if (!net_eq(net, &init_net))