Merge tag 'modules-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2020 19:31:16 +0000 (12:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2020 19:31:16 +0000 (12:31 -0700)
commit084623e468d535d98f883cc2ccf2c4fdf2108556
tree19c9a7b1aaef221f0e3d2116b76e8240102f53b7
parentf4dd60a3d4c7656dcaa0ba2afb503528c86f913f
parent5c3a7db0c7ec4bbd5bd3f48af9be859a8fa3e532
Merge tag 'modules-for-v5.8' of git://git./linux/kernel/git/jeyu/linux

Pull module updates from Jessica Yu:

 - Harden CONFIG_STRICT_MODULE_RWX by rejecting any module that has
   SHF_WRITE|SHF_EXECINSTR sections

 - Remove and clean up nested #ifdefs, as it makes code hard to read

* tag 'modules-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: Harden STRICT_MODULE_RWX
  module: break nested ARCH_HAS_STRICT_MODULE_RWX and STRICT_MODULE_RWX #ifdefs
kernel/module.c