summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* security/keys/keyctl.c: suppress memory allocation failure warningAndrew Morton2012-05-311-1/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-05-234-29/+41
|\
| * userns: Convert capabilities related permsion checksEric W. Biederman2012-05-031-15/+26
| * userns: Store uid and gid values in struct cred with kuid_t and kgid_t typesEric W. Biederman2012-05-031-2/+1
| * userns: Convert group_info values from gid_t to kgid_t.Eric W. Biederman2012-05-031-1/+2
| * userns: Simplify the user_namespace by making userns->creator a kuid.Eric W. Biederman2012-04-261-2/+3
| * userns: Add an explicit reference to the parent user namespaceEric W. Biederman2012-04-071-1/+1
| * cred: Refcount the user_ns pointed to by the cred.Eric W. Biederman2012-04-071-1/+1
| * userns: Use cred->user_ns instead of cred->user->user_nsEric W. Biederman2012-04-074-10/+10
* | Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-05-221-8/+2
|\ \
| * | cgroup: convert all non-memcg controllers to the new cftype interfaceTejun Heo2012-04-011-8/+2
| |/
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-05-2150-1102/+1857
|\ \
| * \ Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into nextJames Morris2012-05-2229-335/+415
| |\ \
| | * | SELinux: remove unused common_audit_data in flush_unauthorized_filesEric Paris2012-04-091-4/+0
| | * | SELinux: avc: remove the useless fields in avc_add_callbackWanlong Gao2012-04-096-47/+15
| | * | SELinux: replace weak GFP_ATOMIC to GFP_KERNEL in avc_add_callbackWanlong Gao2012-04-091-2/+2
| | * | SELinux: unify the selinux_audit_data and selinux_late_audit_dataEric Paris2012-04-093-91/+16
| | * | SELinux: remove auditdeny from selinux_audit_dataEric Paris2012-04-091-8/+1
| | * | LSM: do not initialize common_audit_data to 0Eric Paris2012-04-0911-44/+44
| | * | LSM: BUILD_BUG_ON if the common_audit_data union ever growsEric Paris2012-04-091-0/+7
| | * | LSM: remove the task field from common_audit_dataEric Paris2012-04-092-7/+2
| | * | apparmor: move task from common_audit_data to apparmor_audit_dataEric Paris2012-04-093-3/+11
| | * | LSM: remove the COMMON_AUDIT_DATA_INIT type expansionEric Paris2012-04-0910-43/+43
| | * | SELinux: move common_audit_data to a noinline slow path functionEric Paris2012-04-091-11/+21
| | * | SELinux: remove inode_has_perm_noadpEric Paris2012-04-091-24/+4
| | * | SELinux: delay initialization of audit data in selinux_inode_permissionEric Paris2012-04-093-70/+105
| | * | SELinux: if sel_make_bools errors don't leave inconsistent stateEric Paris2012-04-091-0/+1
| | * | SELinux: remove needless sel_div functionEric Paris2012-04-091-6/+1
| | * | SELinux: possible NULL deref in context_struct_to_stringEric Paris2012-04-091-3/+5
| | * | SELinux: audit failed attempts to set invalid labelsEric Paris2012-04-091-2/+34
| | * | SELinux: rename dentry_open to file_openEric Paris2012-04-096-15/+15
| | * | SELinux: check OPEN on truncate callsEric Paris2012-04-091-1/+5
| | * | SELinux: add default_type statementsEric Paris2012-04-094-6/+33
| | * | SELinux: allow default source/target selectors for user/role/rangeEric Paris2012-04-096-8/+109
| | * | SELinux: loosen DAC perms on reading policyEric Paris2012-04-091-1/+1
| | * | SELinux: allow seek operations on the file exposing policyEric Paris2012-04-091-0/+1
| * | | apparmor: fix long path failure due to disconnected pathJohn Johansen2012-05-181-0/+2
| * | | apparmor: fix profile lookup for unconfinedJohn Johansen2012-05-181-0/+4
| * | | ima: fix filename hint to reflect script interpreter nameMimi Zohar2012-05-161-1/+3
| * | | Merge branch 'for-1205' of http://git.gitorious.org/smack-next/kernel into nextJames Morris2012-05-164-539/+981
| |\ \ \
| | * | | Smack: allow for significantly longer Smack labels v4Casey Schaufler2012-05-144-526/+941
| | * | | gfp flags for security_inode_alloc()?Tetsuo Handa2012-05-141-4/+4
| | * | | Smack: recursive tramsmuteCasey Schaufler2012-05-142-9/+36
| * | | | KEYS: Don't check for NULL key pointer in key_validate()David Howells2012-05-161-24/+16
| |/ / /
| * | | Yama: replace capable() with ns_capable()Kees Cook2012-05-151-2/+2
| * | | TOMOYO: Accept manager programs which do not start with / .Tetsuo Handa2012-05-152-21/+6
| * | | KEYS: Add invalidation supportDavid Howells2012-05-118-28/+110
| * | | KEYS: Do LRU discard in full keyringsDavid Howells2012-05-112-7/+42
| * | | KEYS: Permit in-place link replacement in keyring listDavid Howells2012-05-112-40/+57
| * | | KEYS: Perform RCU synchronisation on keys prior to key destructionDavid Howells2012-05-111-29/+44