Commit 7a684c45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull module update from Rusty Russell:
 "Nothing all that exciting; a new module-from-fd syscall for those who
  want to verify the source of the module (ChromeOS) and/or use standard
  IMA on it or other security hooks."

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  MODSIGN: Fix kbuild output when using default extra_certificates
  MODSIGN: Avoid using .incbin in C source
  modules: don't hand 0 to vmalloc.
  module: Remove a extra null character at the top of module->strtab.
  ASN.1: Use the ASN1_LONG_TAG and ASN1_INDEFINITE_LENGTH constants
  ASN.1: Define indefinite length marker constant
  moduleparam: use __UNIQUE_ID()
  __UNIQUE_ID()
  MODSIGN: Add modules_sign make target
  powerpc: add finit_module syscall.
  ima: support new kernel module syscall
  add finit_module syscall to asm-generic
  ARM: add finit_module syscall to ARM
  security: introduce kernel_module_from_file hook
  module: add flags arg to sys_finit_module()
  module: add syscall to load module from fd
parents 7f2de817 e10e1774

Documentation/ABI/testing/ima_policy

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Description: 
			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]



		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]

		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK][MODULE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			uid:= decimal value
@@ -53,6 +53,7 @@ Description: 
			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=FILE_CHECK mask=MAY_READ uid=0

			measure func=MODULE_CHECK uid=0

			appraise fowner=0



		The default policy measures all executables in bprm_check,

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -981,6 +981,12 @@ _modinst_post: _modinst_ 
	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst

	$(call cmd,depmod)



ifeq ($(CONFIG_MODULE_SIG), y)

PHONY += modules_sign

modules_sign:

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modsign

endif



else # CONFIG_MODULES



# Modules not configured

arch/arm/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ 
#define __NR_process_vm_readv		(__NR_SYSCALL_BASE+376)

#define __NR_process_vm_writev		(__NR_SYSCALL_BASE+377)

					/* 378 for kcmp */

#define __NR_finit_module		(__NR_SYSCALL_BASE+379)



/*

 * This may need to be greater than __NR_last_syscall+1 in order to

arch/arm/kernel/calls.S

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ 
		CALL(sys_process_vm_readv)

		CALL(sys_process_vm_writev)

		CALL(sys_ni_syscall)	/* reserved for sys_kcmp */

		CALL(sys_finit_module)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/cris/kernel/module.c

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
#ifdef CONFIG_ETRAX_KMALLOCED_MODULES

void *module_alloc(unsigned long size)

{

	if (size == 0)

		return NULL;

	return kmalloc(size, GFP_KERNEL);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE