Linus Torvalds cb60e3e65c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris:
 "New notable features:
   - The seccomp work from Will Drewry
   - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski
   - Longer security labels for Smack from Casey Schaufler
   - Additional ptrace restriction modes for Yama by Kees Cook"

Fix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)
  apparmor: fix long path failure due to disconnected path
  apparmor: fix profile lookup for unconfined
  ima: fix filename hint to reflect script interpreter name
  KEYS: Don't check for NULL key pointer in key_validate()
  Smack: allow for significantly longer Smack labels v4
  gfp flags for security_inode_alloc()?
  Smack: recursive tramsmute
  Yama: replace capable() with ns_capable()
  TOMOYO: Accept manager programs which do not start with / .
  KEYS: Add invalidation support
  KEYS: Do LRU discard in full keyrings
  KEYS: Permit in-place link replacement in keyring list
  KEYS: Perform RCU synchronisation on keys prior to key destruction
  KEYS: Announce key type (un)registration
  KEYS: Reorganise keys Makefile
  KEYS: Move the key config into security/keys/Kconfig
  KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat
  Yama: remove an unused variable
  samples/seccomp: fix dependencies on arch macros
  Yama: add additional ptrace scopes
  ...
2012-05-21 20:27:36 -07:00
..
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2012-03-28 18:30:02 +01:00
2011-12-07 22:03:45 +00:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2010-10-04 18:33:54 +01:00
2012-05-05 13:00:24 +02:00
2012-03-28 18:30:02 +01:00
2012-03-29 15:38:30 +10:30
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-04-26 12:06:11 +02:00
2012-03-28 18:30:02 +01:00
2012-03-29 15:38:30 +10:30
2012-03-28 18:30:02 +01:00
2011-07-26 16:49:47 -07:00
2012-03-28 18:30:02 +01:00
2009-06-24 18:34:40 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-23 16:58:42 -07:00
2012-03-28 18:30:02 +01:00