From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Jan 2013 15:37:36 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=7991b03d653865e4de7e6c056f85c004f542dbbe;p=linux-edison.git

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

7991b03d653865e4de7e6c056f85c004f542dbbe