• L
    Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 10b1eb7d
    Linus Torvalds 提交于
    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
socket.c 84.3 KB