Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f4c98e1 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 updates from Rusty Russell:
 "Nothing major: the stricter permissions checking for sysfs broke a
  staging driver; fix included.  Greg KH said he'd take the patch but
  hadn't as the merge window opened, so it's included here to avoid
  breaking build"

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  staging: fix up speakup kobject mode
  Use 'E' instead of 'X' for unsigned module taint flag.
  VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.
  kallsyms: fix percpu vars on x86-64 with relocation.
  kallsyms: generalize address range checking
  module: LLVMLinux: Remove unused function warning from __param_check macro
  Fix: module signature vs tracepoints: add new TAINT_UNSIGNED_MODULE
  module: remove MODULE_GENERIC_TABLE
  module: allow multiple calls to MODULE_DEVICE_TABLE() per module
  module: use pr_cont
parents 18a1a7a1 22c9bcad

Documentation/ABI/testing/sysfs-module

+1 −0
Original line number Diff line number Diff line
@@ -49,3 +49,4 @@ Description: Module taint flags: 
			O - out-of-tree module

			F - force-loaded module

			C - staging driver module

			E - unsigned module

Documentation/module-signing.txt

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ This has a number of options available: 


     If this is off (ie. "permissive"), then modules for which the key is not

     available and modules that are unsigned are permitted, but the kernel will

     be marked as being tainted.

     be marked as being tainted, and the concerned modules will be marked as

     tainted, shown with the character 'E'.



     If this is on (ie. "restrictive"), only modules that have a valid

     signature that can be verified by a public key in the kernel's possession

Documentation/oops-tracing.txt

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ characters, each representing a particular tainted value. 


 13: 'O' if an externally-built ("out-of-tree") module has been loaded.



 14: 'E' if an unsigned module has been loaded in a kernel supporting

     module signature.



The primary reason for the 'Tainted: ' string is to tell kernel

debuggers if this is a clean kernel or if anything unusual has

occurred.  Tainting is permanent: even if an offending module is

Documentation/sysctl/kernel.txt

+2 −0
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ can be ORed together: 
1024 - A module from drivers/staging was loaded.

2048 - The system is working around a severe firmware bug.

4096 - An out-of-tree module has been loaded.

8192 - An unsigned module has been loaded in a kernel supporting module

       signature.



==============================================================

drivers/pci/slot.c

+3 −3
Original line number Diff line number Diff line
@@ -116,11 +116,11 @@ static void pci_slot_release(struct kobject *kobj) 
}



static struct pci_slot_attribute pci_slot_attr_address =

	__ATTR(address, (S_IFREG | S_IRUGO), address_read_file, NULL);

	__ATTR(address, S_IRUGO, address_read_file, NULL);

static struct pci_slot_attribute pci_slot_attr_max_speed =

	__ATTR(max_bus_speed, (S_IFREG | S_IRUGO), max_speed_read_file, NULL);

	__ATTR(max_bus_speed, S_IRUGO, max_speed_read_file, NULL);

static struct pci_slot_attribute pci_slot_attr_cur_speed =

	__ATTR(cur_bus_speed, (S_IFREG | S_IRUGO), cur_speed_read_file, NULL);

	__ATTR(cur_bus_speed, S_IRUGO, cur_speed_read_file, NULL);



static struct attribute *pci_slot_default_attrs[] = {

	&pci_slot_attr_address.attr,