Merge tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Mar 2022 18:43:01 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Mar 2022 18:43:01 +0000 (11:43 -0700)
commitf87cbd0565eb7e2fa15296c74210658db1346431
treeb71ab11be7a27c741a0d7a6f32897691847e9971
parent2975dbdc3989cd66a4cb5a7c5510de2de8ee4d14
parent229a08a4f4e4f9949801cc39b6480ddc9c487183
Merge tag 'hardening-v5.18-rc1-fix1' of git://git./linux/kernel/git/kees/linux

Pull hardening updates from Kees Cook:
 "This addresses an -Warray-bounds warning found under a few ARM
  defconfigs, and disables long-broken HARDENED_USERCOPY_PAGESPAN"

* tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  ARM/dma-mapping: Remove CMA code when not built with CMA
  usercopy: Disable CONFIG_HARDENED_USERCOPY_PAGESPAN
include/linux/cma.h
security/Kconfig