Commit 763978ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux 

Pull module updates from Luis Chamberlain:
 "The biggest change here is in-kernel support for module decompression.
  This change is being made to help support LSMs like LoadPin as
  otherwise it loses link between the source of kernel module on the
  disk and binary blob that is being loaded into the kernel.

  kmod decompression is still done by userspace even with this is done,
  both because there are no measurable gains in not doing so and as it
  adds a secondary extra check for validating the module before loading
  it into the kernel.

  The rest of the changes are minor, the only other change worth
  mentionin there is Jessica Yu is now bowing out of maintenance of
  modules as she's taking a break from work.

  While there were other changes posted for modules, those have not yet
  received much review of testing so I'm not yet comfortable in merging
  any of those changes yet."

* 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
  module: fix signature check failures when using in-kernel decompression
  kernel: Fix spelling mistake "compresser" -> "compressor"
  MAINTAINERS: add mailing lists for kmod and modules
  module.h: allow #define strings to work with MODULE_IMPORT_NS
  module: add in-kernel support for decompressing
  MAINTAINERS: Remove myself as modules maintainer
  module: Remove outdated comment
parents 98f23457 a97ac8cb

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -10705,6 +10705,7 @@ F: samples/kmemleak/kmemleak-test.c 
KMOD KERNEL MODULE LOADER - USERMODE HELPER

M:	Luis Chamberlain <mcgrof@kernel.org>

L:	linux-kernel@vger.kernel.org

L:	linux-modules@vger.kernel.org

S:	Maintained

F:	include/linux/kmod.h

F:	kernel/kmod.c
@@ -12994,9 +12995,10 @@ F: drivers/media/dvb-frontends/mn88473* 








MODULE SUPPORT









M:	Luis Chamberlain <mcgrof@kernel.org>









M:	Jessica Yu <jeyu@kernel.org>









L:	linux-modules@vger.kernel.org









L:	linux-kernel@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next









F:	include/linux/module.h









F:	kernel/module.c








































include/linux/module.h



+2
−1






























Original line number
Diff line number
Diff line







@@ -290,7 +290,8 @@ extern typeof(name) __mod_##type##__##name##_device_table		\







 * files require multiple MODULE_FIRMWARE() specifiers */









#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)



















#define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, #ns)









#define _MODULE_IMPORT_NS(ns)	MODULE_INFO(import_ns, #ns)









#define MODULE_IMPORT_NS(ns)	_MODULE_IMPORT_NS(ns)



















struct notifier_block;










































include/uapi/linux/module.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -5,5 +5,6 @@







/* Flags for sys_finit_module: */









#define MODULE_INIT_IGNORE_MODVERSIONS	1









#define MODULE_INIT_IGNORE_VERMAGIC	2









#define MODULE_INIT_COMPRESSED_FILE	4



















#endif /* _UAPI_LINUX_MODULE_H */
























init/Kconfig



+13
−0






























Original line number
Diff line number
Diff line







@@ -2278,6 +2278,19 @@ config MODULE_COMPRESS_ZSTD

















endchoice



















config MODULE_DECOMPRESS









	bool "Support in-kernel module decompression"









	depends on MODULE_COMPRESS_GZIP || MODULE_COMPRESS_XZ









	select ZLIB_INFLATE if MODULE_COMPRESS_GZIP









	select XZ_DEC if MODULE_COMPRESS_XZ









	help



















	  Support for decompressing kernel modules by the kernel itself









	  instead of relying on userspace to perform this task. Useful when









	  load pinning security policy is enabled.



















	  If unsure, say N.



















config MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS









	bool "Allow loading of modules with missing namespace imports"









	help
































kernel/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -67,6 +67,7 @@ obj-y += up.o







endif









obj-$(CONFIG_UID16) += uid16.o









obj-$(CONFIG_MODULES) += module.o









obj-$(CONFIG_MODULE_DECOMPRESS) += module_decompress.o









obj-$(CONFIG_MODULE_SIG) += module_signing.o









obj-$(CONFIG_MODULE_SIG_FORMAT) += module_signature.o









obj-$(CONFIG_KALLSYMS) += kallsyms.o