• Linus Torvalds's avatar
    Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 10b1eb7d
    Linus Torvalds authored
    Pull security system updates from James Morris:
    
     - incorporate new socketpair() hook into LSM and wire up the SELinux
       and Smack modules. From David Herrmann:
    
         "The idea is to allow SO_PEERSEC to be called on AF_UNIX sockets
          created via socketpair(2), and return the same information as if
          you emulated socketpair(2) via a temporary listener socket.
    
          Right now SO_PEERSEC will return the unlabeled credentials for a
          socketpair, rather than the actual credentials of the creating
          process."
    
     - remove the unused security_settime LSM hook (Sargun Dhillon).
    
     - remove some stack allocated arrays from the keys code (Tycho
       Andersen)
    
    * 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      dh key: get rid of stack allocated array for zeroes
      dh key: get rid of stack allocated array
      big key: get rid of stack array allocation
      smack: provide socketpair callback
      selinux: provide socketpair callback
      net: hook socketpair() into LSM
      security: add hook for socketpair()
      security: remove security_settime
    10b1eb7d
Name
Last commit
Last update
..
encrypted-keys Loading commit data...
Kconfig Loading commit data...
Makefile Loading commit data...
big_key.c Loading commit data...
compat.c Loading commit data...
compat_dh.c Loading commit data...
dh.c Loading commit data...
gc.c Loading commit data...
internal.h Loading commit data...
key.c Loading commit data...
keyctl.c Loading commit data...
keyring.c Loading commit data...
permission.c Loading commit data...
persistent.c Loading commit data...
proc.c Loading commit data...
process_keys.c Loading commit data...
request_key.c Loading commit data...
request_key_auth.c Loading commit data...
sysctl.c Loading commit data...
trusted.c Loading commit data...
trusted.h Loading commit data...
user_defined.c Loading commit data...