]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2014 16:38:07 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2014 16:38:07 +0000 (09:38 -0700)
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

12 files changed:
1  2 
Documentation/module-signing.txt
Documentation/sysctl/kernel.txt
drivers/staging/speakup/speakup_dectlk.c
fs/fuse/cuse.c
fs/ocfs2/stackglue.c
include/linux/kernel.h
include/linux/module.h
include/linux/sysfs.h
kernel/module.c
kernel/panic.c
kernel/tracepoint.c
scripts/mod/file2alias.c

Simple merge
Simple merge
diff --cc fs/fuse/cuse.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/module.c
index 8dc7f5e80dd8f75273ef15df03a14615de1579d4,5806e096d110c05afb32b4fa64fc869ea832cab8..29f7790eaa147a1b0fc7ec223c5356f44caab346
@@@ -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;
diff --cc kernel/panic.c
Simple merge
Simple merge
Simple merge