Merge tag 'hardening-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

Pull hardening updates from Kees Cook:
 "One of the more voluminous set of changes is for adding the new
  __counted_by annotation[1] to gain run-time bounds checking of
  dynamically sized arrays with UBSan.

   - Add LKDTM test for stuck CPUs (Mark Rutland)

   - Improve LKDTM selftest behavior under UBSan (Ricardo Cañuelo)

   - Refactor more 1-element arrays into flexible arrays (Gustavo A. R.
     Silva)

   - Analyze and replace strlcpy and strncpy uses (Justin Stitt, Azeem
     Shaikh)

   - Convert group_info.usage to refcount_t (Elena Reshetova)

   - Add __counted_by annotations (Kees Cook, Gustavo A. R. Silva)

   - Add Kconfig fragment for basic hardening options (Kees Cook, Lukas
     Bulwahn)

   - Fix randstruct GCC plugin performance mode to stay in groups (Kees
     Cook)

   - Fix strtomem() compile-time check for small sources (Kees Cook)"

* tag 'hardening-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (56 commits)
  hwmon: (acpi_power_meter) replace open-coded kmemdup_nul
  reset: Annotate struct reset_control_array with __counted_by
  kexec: Annotate struct crash_mem with __counted_by
  virtio_console: Annotate struct port_buffer with __counted_by
  ima: Add __counted_by for struct modsig and use struct_size()
  MAINTAINERS: Include stackleak paths in hardening entry
  string: Adjust strtomem() logic to allow for smaller sources
  hardening: x86: drop reference to removed config AMD_IOMMU_V2
  randstruct: Fix gcc-plugin performance mode to stay in group
  mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by
  drivers: thermal: tsens: Annotate struct tsens_priv with __counted_by
  irqchip/imx-intmux: Annotate struct intmux_data with __counted_by
  KVM: Annotate struct kvm_irq_routing_table with __counted_by
  virt: acrn: Annotate struct vm_memory_region_batch with __counted_by
  hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by
  sparc: Annotate struct cpuinfo_tree with __counted_by
  isdn: kcapi: replace deprecated strncpy with strscpy_pad
  isdn: replace deprecated strncpy with strscpy
  NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by
  nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by
  ...

diff --combined MAINTAINERS
index 55d9d860f1a79127d7a2a504cdb46dc9d4f9b93e,a4de29c0036f8f380fb3d04b7c60b61afdd303d3..c6b0078aca072273eede24b7a7ea4b0ca0ded613
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -378,9 -378,8 +378,9 @@@ F: drivers/acpi/viot.
  F:    include/linux/acpi_viot.h
  
  ACPI WMI DRIVER
 +M:    Armin Wolf <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/driver-api/wmi.rst
  F:    Documentation/wmi/
  F:    drivers/platform/x86/wmi.c
@@@ -471,6 -470,7 +471,6 @@@ F: drivers/hwmon/adm1029.
  ADM8211 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
@@@ -1585,17 -1585,6 +1585,17 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM GENERIC INTERRUPT CONTROLLER DRIVERS
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,gic*
 +F:    arch/arm/include/asm/arch_gicv3.h
 +F:    arch/arm64/include/asm/arch_gicv3.h
 +F:    drivers/irqchip/irq-gic*.[ch]
 +F:    include/linux/irqchip/arm-gic*.h
 +F:    include/linux/irqchip/arm-vgic-info.h
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1673,7 -1662,7 +1673,7 @@@ F:      arch/arm*/include/asm/perf_event.
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
  F:    drivers/perf/
 -F:    include/linux/perf/arm_pmu.h
 +F:    include/linux/perf/arm_pmu*.h
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -1974,12 -1963,12 +1974,12 @@@ F:   drivers/irqchip/irq-aspeed-i2c-ic.
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <[email protected]>
 -R:    Andrew Jeffery <andrew@aj.id.au>
 +R:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
  F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed/
  F:    arch/arm/mach-aspeed/
@@@ -2222,28 -2211,21 +2222,28 @@@ F:   arch/arm/boot/dts/ti/omap/omap3-igep
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
  F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/boot/dts/intel/ixp/
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  F:    drivers/clocksource/timer-ixp4xx.c
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    include/linux/soc/ixp4xx/qmgr.h
  
  ARM/INTEL KEEMBAY ARCHITECTURE
  M:    Paul J. Murphy <[email protected]>
@@@ -2345,7 -2327,7 +2345,7 @@@ F:      drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 -R:    AngeloGioacchino Del Regno <[email protected]>
 +M:    AngeloGioacchino Del Regno <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -3076,7 -3058,7 +3076,7 @@@ F:      Documentation/devicetree/bindings/pe
  F:    drivers/peci/controller/peci-aspeed.c
  
  ASPEED PINCTRL DRIVERS
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3093,7 -3075,7 +3093,7 @@@ F:      drivers/irqchip/irq-aspeed-scu-ic.
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
  ASPEED SD/MMC DRIVER
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3362,7 -3344,7 +3362,7 @@@ AX.25 NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/ax25.h
  F:    include/uapi/linux/ax25.h
  F:    net/ax25/
@@@ -3482,14 -3464,6 +3482,14 @@@ W:    http://bcache.evilpiepirate.or
  C:    irc://irc.oftc.net/bcache
  F:    drivers/md/bcache/
  
 +BCACHEFS
 +M:    Kent Overstreet <[email protected]>
 +R:    Brian Foster <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    fs/bcachefs/
 +
  BDISP ST MEDIA DRIVER
  M:    Fabien Dessenne <[email protected]>
  L:    [email protected]
@@@ -4108,7 -4082,7 +4108,7 @@@ F:      drivers/net/wireless/broadcom/brcm80
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
 -M:    Florian Fainelli <florian.fainelli@broadcom>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
  R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
@@@ -5076,14 -5050,6 +5076,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/timer/
  F:    drivers/clocksource/
  
 +CLOSURES
 +M:    Kent Overstreet <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/closure.h
 +F:    lib/closure.c
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  M:    Daniel Oliveira Nascimento <[email protected]>
@@@ -6019,8 -5985,8 +6019,8 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
  M:    Mike Snitzer <[email protected]>
 -M:    dm-devel@redhat.com
 -L:    dm-devel@redhat.com
 +M:    dm-devel@lists.linux.dev
 +L:    dm-devel@lists.linux.dev
  S:    Maintained
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
@@@ -6679,9 -6645,9 +6679,9 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-novatek-nt36672a.c
  
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 -M:    Ben Skeggs <[email protected]>
  M:    Karol Herbst <[email protected]>
  M:    Lyude Paul <[email protected]>
 +M:    Danilo Krummrich <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -6782,7 -6748,7 +6782,7 @@@ F:      drivers/gpu/drm/panel/panel-sitronix
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 -R:    Ondrej Jirman <meg[email protected]>
 +R:    Ondrej Jirman <meg[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@@ -8127,7 -8093,7 +8127,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 -M:    Russ Weight <russ[email protected]>
 +M:    Russ Weight <russ[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -8649,6 -8615,8 +8649,8 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
+ F:    include/linux/stackleak.h
+ F:    kernel/stackleak.c
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
  
@@@ -8764,13 -8732,6 +8766,13 @@@ S:    Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
  F:    drivers/pmdomain/
  
 +GENERIC RADIX TREE
 +M:    Kent Overstreet <[email protected]>
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/generic-radix-tree.h
 +F:    lib/generic-radix-tree.c
 +
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
@@@ -8915,7 -8876,7 +8917,7 @@@ F:      drivers/gpio/gpio-mockup.
  F:    tools/testing/selftests/gpio/
  
  GPIO REGMAP
 -R:    Michael Walle <[email protected]>
 +M:    Michael Walle <[email protected]>
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
@@@ -9572,8 -9533,10 +9574,8 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/pressure/mprls0025pa.c
  
  HOST AP DRIVER
 -M:    Jouni Malinen <[email protected]>
  L:    [email protected]
  S:    Obsolete
 -W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
  HP BIOSCFG DRIVER
@@@ -10661,6 -10624,22 +10663,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 -F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 -F:    include/linux/soc/ixp4xx/npe.h
 -F:    include/linux/soc/ixp4xx/qmgr.h
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 -
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <[email protected]>
  M:    Edmund Dea <[email protected]>
@@@ -10724,7 -10703,7 +10726,7 @@@ F:   drivers/mfd/intel-m10-bmc
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MAX10 BMC SECURE UPDATES
 -M:    Russ Weight <russell.h.weight@intel.com>
 +M:    Peter Colberg <peter.colberg@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
@@@ -11086,7 -11065,7 +11088,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/sma*
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/core-api/irq/irq-domain.rst
@@@ -11105,6 -11084,7 +11107,6 @@@ F:   lib/group_cpus.
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
 -M:    Marc Zyngier <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -11415,16 -11395,20 +11417,20 @@@ F:        usr
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <[email protected]>
+ R:    Gustavo A. R. Silva <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/ABI/testing/sysfs-kernel-oops_count
  F:    Documentation/ABI/testing/sysfs-kernel-warn_count
+ F:    arch/*/configs/hardening.config
  F:    include/linux/overflow.h
  F:    include/linux/randomize_kstack.h
+ F:    kernel/configs/hardening.config
  F:    mm/usercopy.c
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
+ K:    \b__counted_by\b
  
  KERNEL JANITORS
  L:    [email protected]
@@@ -13638,7 -13622,6 +13644,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
@@@ -13869,10 -13852,9 +13875,10 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
 -M:    Vladimir Vid <vladimir.vid@sartura.hr>
 +M:    Robert Marko <robert.marko@sartura.hr>
  S:    Maintained
 -F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14234,7 -14216,6 +14240,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -14781,7 -14762,7 +14787,7 @@@ NETROM NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/netrom.h
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
@@@ -14970,7 -14951,7 +14976,7 @@@ K:   macse
  K:    \bmdo_
  
  NETWORKING [MPTCP]
 -M:    Matthieu Baerts <matt[email protected]>
 +M:    Matthieu Baerts <matt[email protected]>
  M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15155,7 -15136,7 +15161,7 @@@ NOLIBC HEADER FIL
  M:    Willy Tarreau <[email protected]>
  M:    Thomas Weißschuh <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
@@@ -17625,7 -17606,6 +17631,7 @@@ M:   Kalle Valo <[email protected]
  M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
 +W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
  
@@@ -18156,6 -18136,8 +18162,6 @@@ REALTEK WIRELESS DRIVER (rtlwifi family
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
@@@ -18631,7 -18613,7 +18637,7 @@@ ROSE NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/rose.h
  F:    include/uapi/linux/rose.h
  F:    net/rose/
@@@ -18683,6 -18665,7 +18689,6 @@@ F:   drivers/media/dvb-frontends/rtl2832_
  RTL8180 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -18690,12 -18673,14 +18696,12 @@@ M:        Hin-Tak Leung <[email protected]
  M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
@@@ -20509,7 -20494,6 +20515,7 @@@ F:   include/dt-bindings/clock/starfive?j
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  M:    Jianlong Huang <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
@@@ -21678,6 -21662,7 +21684,6 @@@ L:   [email protected]
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
  F:    drivers/net/wireless/ti/
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
@@@ -23444,11 -23429,9 +23450,11 @@@ F: drivers/platform/x86/x86-android-tab
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  L:    [email protected]
  S:    Maintained
 +Q:    https://patchwork.kernel.org/project/platform-driver-x86/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
@@@ -23738,13 -23721,6 +23744,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX VERSAL EDAC DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +M:    Sai Krishna Potthuri <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
 +F:    drivers/edac/versal_edac.c
 +
  XILINX WATCHDOG DRIVER
  M:    Srinivas Neeli <[email protected]>
  R:    Shubhrajyoti Datta <[email protected]>

diff --combined drivers/block/drbd/drbd_int.h
index f017e917612b95f7e4e5cc20a51f4d104e1780ac,7eecc53fae3d39d32b4cbaea4f1cd6fcd5d75bae..c21e3732759ec21069939f43ca944e044ea95095
--- 1/drivers/block/drbd/drbd_int.h
--- 2/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@@ -524,9 -524,7 +524,9 @@@ struct drbd_md 
  
  struct drbd_backing_dev {
        struct block_device *backing_bdev;
 +      struct bdev_handle *backing_bdev_handle;
        struct block_device *md_bdev;
 +      struct bdev_handle *md_bdev_handle;
        struct drbd_md md;
        struct disk_conf *disk_conf; /* RCU, for updates: resource->conf_update */
        sector_t known_size; /* last known size of that backing device */
@@@ -555,7 -553,7 +555,7 @@@ struct fifo_buffer 
        unsigned int head_index;
        unsigned int size;
        int total; /* sum of all values */
-       int values[];
+       int values[] __counted_by(size);
  };
  extern struct fifo_buffer *fifo_alloc(unsigned int fifo_size);
  

diff --combined drivers/md/dm-crypt.c
index 5315fd261c23b7f084b4b049b374e9b8941bc7eb,f276e9460feb4863a06558a15578045a94200df4..be32a290c90acd0a5ca428c8f301326851fdb897
--- 1/drivers/md/dm-crypt.c
--- 2/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@@ -224,7 -224,7 +224,7 @@@ struct crypt_config 
        struct mutex bio_alloc_lock;
  
        u8 *authenc_key; /* space for keys in authenc() format (if used) */
-       u8 key[];
+       u8 key[] __counted_by(key_size);
  };
  
  #define MIN_IOS               64
@@@ -753,8 -753,7 +753,8 @@@ static int crypt_iv_eboiv_gen(struct cr
        int err;
        u8 *buf;
  
 -      reqsize = ALIGN(crypto_skcipher_reqsize(tfm), __alignof__(__le64));
 +      reqsize = sizeof(*req) + crypto_skcipher_reqsize(tfm);
 +      reqsize = ALIGN(reqsize, __alignof__(__le64));
  
        req = kmalloc(reqsize + cc->iv_size, GFP_NOIO);
        if (!req)

diff --combined drivers/usb/gadget/function/f_fs.c
index ec26df0306f2de0fc9ac05dd1036c91dfdf7e143,af400d0837776661514e0405835d9121d1aff39b..efe3e3b857695e6dc80e5c217294f3343153845c
--- 1/drivers/usb/gadget/function/f_fs.c
--- 2/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@@ -202,7 -202,7 +202,7 @@@ struct ffs_epfile 
  struct ffs_buffer {
        size_t length;
        char *data;
-       char storage[];
+       char storage[] __counted_by(length);
  };
  
  /*  ffs_io_data structure ***************************************************/
@@@ -1383,8 -1383,8 +1383,8 @@@ ffs_sb_make_inode(struct super_block *s
                inode->i_mode    = perms->mode;
                inode->i_uid     = perms->uid;
                inode->i_gid     = perms->gid;
 -              inode->i_atime   = ts;
 -              inode->i_mtime   = ts;
 +              inode_set_atime_to_ts(inode, ts);
 +              inode_set_mtime_to_ts(inode, ts);
                inode->i_private = data;
                if (fops)
                        inode->i_fop = fops;

diff --combined drivers/usb/host/xhci.h
index 5df370482521f74fe8784c2b531ed3aca7371a1c,2f21c3a8565c79773ac066a6b45dcc194b3c7d4f..3d0451f5880ab7c55fe1ca85f39fa63fbb8f44ff
--- 1/drivers/usb/host/xhci.h
--- 2/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -514,7 -514,7 +514,7 @@@ struct xhci_intr_reg 
  #define       ERST_SIZE_MASK          (0xffff << 16)
  
  /* erst_base bitmasks */
 -#define ERST_BASE_RSVDP               (0x3f)
 +#define ERST_BASE_RSVDP               (GENMASK_ULL(5, 0))
  
  /* erst_dequeue bitmasks */
  /* Dequeue ERST Segment Index (DESI) - Segment number (or alias)
@@@ -1666,7 -1666,7 +1666,7 @@@ struct xhci_scratchpad 
  struct urb_priv {
        int     num_tds;
        int     num_tds_done;
-       struct  xhci_td td[];
+       struct  xhci_td td[] __counted_by(num_tds);
  };
  
  /*

diff --combined fs/afs/internal.h
index 23e2cc4efe414df288c714a486d5fa8f4a6b627c,469a717467a4a74cd1c3e1974536d68bd3ae6b81..c9cef3782b4ae48dee3be851aead7fb7de4fd42b
--- 1/fs/afs/internal.h
--- 2/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@@ -87,7 -87,7 +87,7 @@@ struct afs_addr_list 
        enum dns_lookup_status  status:8;
        unsigned long           failed;         /* Mask of addrs that failed locally/ICMP */
        unsigned long           responded;      /* Mask of addrs that responded */
-       struct sockaddr_rxrpc   addrs[];
+       struct sockaddr_rxrpc   addrs[] __counted_by(max_addrs);
  #define AFS_MAX_ADDRESSES ((unsigned int)(sizeof(unsigned long) * 8))
  };
  
@@@ -705,7 -705,7 +705,7 @@@ struct afs_permits 
        refcount_t              usage;
        unsigned short          nr_permits;     /* Number of records */
        bool                    invalidated;    /* Invalidated due to key change */
-       struct afs_permit       permits[];      /* List of permits sorted by key pointer */
+       struct afs_permit       permits[] __counted_by(nr_permits);     /* List of permits sorted by key pointer */
  };
  
  /*
@@@ -1541,7 -1541,7 +1541,7 @@@ int afs_launder_folio(struct folio *)
  /*
   * xattr.c
   */
 -extern const struct xattr_handler *afs_xattr_handlers[];
 +extern const struct xattr_handler * const afs_xattr_handlers[];
  
  /*
   * yfsclient.c