Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...

Pull more overflow updates from Kees Cook:
 "The rest of the overflow changes for v4.18-rc1.

  This includes the explicit overflow fixes from Silvio, further
  struct_size() conversions from Matthew, and a bug fix from Dan.

  But the bulk of it is the treewide conversions to use either the
  2-factor argument allocators (e.g. kmalloc(a * b, ...) into
  kmalloc_array(a, b, ...) or the array_size() macros (e.g. vmalloc(a *
  b) into vmalloc(array_size(a, b)).

  Coccinelle was fighting me on several fronts, so I've done a bunch of
  manual whitespace updates in the patches as well.

  Summary:

   - Error path bug fix for overflow tests (Dan)

   - Additional struct_size() conversions (Matthew, Kees)

   - Explicitly reported overflow fixes (Silvio, Kees)

   - Add missing kvcalloc() function (Kees)

   - Treewide conversions of allocators to use either 2-factor argument
     variant when available, or array_size() and array3_size() as needed
     (Kees)"

* tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (26 commits)
  treewide: Use array_size in f2fs_kvzalloc()
  treewide: Use array_size() in f2fs_kzalloc()
  treewide: Use array_size() in f2fs_kmalloc()
  treewide: Use array_size() in sock_kmalloc()
  treewide: Use array_size() in kvzalloc_node()
  treewide: Use array_size() in vzalloc_node()
  treewide: Use array_size() in vzalloc()
  treewide: Use array_size() in vmalloc()
  treewide: devm_kzalloc() -> devm_kcalloc()
  treewide: devm_kmalloc() -> devm_kmalloc_array()
  treewide: kvzalloc() -> kvcalloc()
  treewide: kvmalloc() -> kvmalloc_array()
  treewide: kzalloc_node() -> kcalloc_node()
  treewide: kzalloc() -> kcalloc()
  treewide: kmalloc() -> kmalloc_array()
  mm: Introduce kvcalloc()
  video: uvesafb: Fix integer overflow in allocation
  UBIFS: Fix potential integer overflow in allocation
  leds: Use struct_size() in allocation
  Convert intel uncore to struct_size
  ...

diff --cc arch/arm/mach-omap2/hsmmc.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_device.c
index ac219b9e6a4c80eb27289e90f231746edf4f8175,06b6bca3a1799dbf4cc43408071b9c207a0a987e..41c7b905980a9e7a37a512cf26c06a428b4e9ca6
--- 1/arch/arm/mach-omap2/omap_device.c
--- 2/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@@ -151,18 -151,11 +151,18 @@@ static int omap_device_build_from_dt(st
                return -ENODEV;
        }
  
 +      /* SDMA still needs special handling for omap_device_build() */
 +      ret = of_property_read_string_index(node, "ti,hwmods", 0, &oh_name);
 +      if (!ret && (!strncmp("dma_system", oh_name, 10) ||
 +                   !strncmp("dma", oh_name, 3)))
 +              skip_pm_domain = true;
 +
        /* Use ti-sysc driver instead of omap_device? */
 -      if (!omap_hwmod_parse_module_range(NULL, node, &res))
 +      if (!skip_pm_domain &&
 +          !omap_hwmod_parse_module_range(NULL, node, &res))
                return -ENODEV;
  
-       hwmods = kzalloc(sizeof(struct omap_hwmod *) * oh_cnt, GFP_KERNEL);
+       hwmods = kcalloc(oh_cnt, sizeof(struct omap_hwmod *), GFP_KERNEL);
        if (!hwmods) {
                ret = -ENOMEM;
                goto odbfd_exit;

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/kvm/cpuid.c
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/firmware/ti_sci.c
Simple merge

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc drivers/md/dm-region-hash.c
Simple merge

diff --cc drivers/md/dm-thin.c
Simple merge

diff --cc drivers/ntb/hw/intel/ntb_hw_gen1.c
Simple merge

diff --cc drivers/ntb/ntb_transport.c
Simple merge

diff --cc drivers/of/platform.c
Simple merge

diff --cc drivers/pci/controller/dwc/pci-dra7xx.c
Simple merge

diff --cc drivers/pci/controller/dwc/pcie-designware-ep.c
Simple merge

diff --cc drivers/pci/controller/pcie-cadence-ep.c
Simple merge

diff --cc drivers/pci/controller/pcie-rockchip-ep.c
Simple merge

diff --cc drivers/soc/mediatek/mtk-scpsys.c
Simple merge

diff --cc drivers/thermal/int340x_thermal/int340x_thermal_zone.c
Simple merge

diff --cc drivers/thermal/of-thermal.c
Simple merge

diff --cc drivers/thermal/tegra/soctherm.c
Simple merge

diff --cc fs/nfs/flexfilelayout/flexfilelayout.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/nfscache.c
Simple merge

diff --cc net/sunrpc/auth_gss/gss_rpc_upcall.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge