From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Apr 2014 16:38:07 +0000 (-0700)
Subject: Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f4c98e1c22c28e00b8f050cce895a6b74db15d1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'modules-next-for-linus' of git://git./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
---

6f4c98e1c22c28e00b8f050cce895a6b74db15d1
diff --cc kernel/module.c
index 8dc7f5e80dd8,5806e096d110..29f7790eaa14
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -1013,9 -1013,11 +1013,11 @@@ static size_t module_flags_taint(struc
  		buf[l++] = 'F';
  	if (mod->taints & (1 << TAINT_CRAP))
  		buf[l++] = 'C';
+ 	if (mod->taints & (1 << TAINT_UNSIGNED_MODULE))
+ 		buf[l++] = 'E';
  	/*
  	 * TAINT_FORCED_RMMOD: could be added.
 -	 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
 +	 * TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
  	 * apply to modules.
  	 */
  	return l;