• Linus Torvalds's avatar
    Merge branch 'for-linus' of... · e0e736fc
    Linus Torvalds authored
    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: (30 commits)
      MAINTAINERS: Add tomoyo-dev-en ML.
      SELinux: define permissions for DCB netlink messages
      encrypted-keys: style and other cleanup
      encrypted-keys: verify datablob size before converting to binary
      trusted-keys: kzalloc and other cleanup
      trusted-keys: additional TSS return code and other error handling
      syslog: check cap_syslog when dmesg_restrict
      Smack: Transmute labels on specified directories
      selinux: cache sidtab_context_to_sid results
      SELinux: do not compute transition labels on mountpoint labeled filesystems
      This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running.
      SELinux: merge policydb_index_classes and policydb_index_others
      selinux: convert part of the sym_val_to_name array to use flex_array
      selinux: convert type_val_to_struct to flex_array
      flex_array: fix flex_array_put_ptr macro to be valid C
      SELinux: do not set automatic i_ino in selinuxfs
      selinux: rework security_netlbl_secattr_to_sid
      SELinux: standardize return code handling in selinuxfs.c
      SELinux: standardize return code handling in selinuxfs.c
      SELinux: standardize return code handling in policydb.c
      ...
    e0e736fc
MAINTAINERS 181 KB