1. 18 Jan, 2012 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · a25a2b84
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        integrity: digital signature config option name change
        lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts
        lib: MPILIB Kconfig description update
        lib: digital signature dependency fix
        lib: digital signature config option name change
        encrypted-keys: fix rcu and sparse messages
        keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages
        KEYS: Add missing smp_rmb() primitives to the keyring search code
        TOMOYO: Accept \000 as a valid character.
        security: update MAINTAINERS file with new git repo
      a25a2b84
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit · f429ee3b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)
        audit: no leading space in audit_log_d_path prefix
        audit: treat s_id as an untrusted string
        audit: fix signedness bug in audit_log_execve_info()
        audit: comparison on interprocess fields
        audit: implement all object interfield comparisons
        audit: allow interfield comparison between gid and ogid
        audit: complex interfield comparison helper
        audit: allow interfield comparison in audit rules
        Kernel: Audit Support For The ARM Platform
        audit: do not call audit_getname on error
        audit: only allow tasks to set their loginuid if it is -1
        audit: remove task argument to audit_set_loginuid
        audit: allow audit matching on inode gid
        audit: allow matching on obj_uid
        audit: remove audit_finish_fork as it can't be called
        audit: reject entry,always rules
        audit: inline audit_free to simplify the look of generic code
        audit: drop audit_set_macxattr as it doesn't do anything
        audit: inline checks for not needing to collect aux records
        audit: drop some potentially inadvisable likely notations
        ...
      
      Use evil merge to fix up grammar mistakes in Kconfig file.
      
      Bad speling and horrible grammar (and copious swearing) is to be
      expected, but let's keep it to commit messages and comments, rather than
      expose it to users in config help texts or printouts.
      f429ee3b
  2. 17 Jan, 2012 38 commits