tree 8c96f4f81f2b1d660d89b9a503afd0aa813f4110
parent 0c4a842349b27d361f1503f6437df303e1b541c9
parent ade24c93ab173b392a905ef8d510874dfb05a417
author Linus Torvalds <torvalds@linux-foundation.org> 1357573056 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1357573056 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull integrity subsystem regression fix from James Morris:
 "Commit fdf90729e578 "ima: support new kernel module syscall" by error
  modified init_module() to return INTEGRITY_UNKNOWN (which is 4) to
  user space if the kernel was built with CONFIG_IMA_APPRAISE=y.

  As a result, user space can no longer load kernel modules using
  init_module().  This commit fixes this regression."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ima: fallback to MODULE_SIG_ENFORCE for existing kernel module syscall