• L
    Merge branch 'for-linus' of... · f6f79190
    Linus Torvalds 提交于
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (57 commits)
      binfmt_elf: fix PT_INTERP bss handling
      TPM: Fixup boot probe timeout for tpm_tis driver
      sysfs: Add labeling support for sysfs
      LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.
      VFS: Factor out part of vfs_setxattr so it can be called from the SELinux hook for inode_setsecctx.
      KEYS: Add missing linux/tracehook.h #inclusions
      KEYS: Fix default security_session_to_parent()
      Security/SELinux: includecheck fix kernel/sysctl.c
      KEYS: security_cred_alloc_blank() should return int under all circumstances
      IMA: open new file for read
      KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]
      KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]
      KEYS: Do some whitespace cleanups [try #6]
      KEYS: Make /proc/keys use keyid not numread as file position [try #6]
      KEYS: Add garbage collection for dead, revoked and expired keys. [try #6]
      KEYS: Flag dead keys to induce EKEYREVOKED [try #6]
      KEYS: Allow keyctl_revoke() on keys that have SETATTR but not WRITE perm [try #6]
      KEYS: Deal with dead-type keys appropriately [try #6]
      CRED: Add some configurable debugging [try #6]
      selinux: Support for the new TUN LSM hooks
      ...
    f6f79190
namei.c 71.0 KB