aboutsummaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-192-2/+4
|\
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2012-07-182-2/+4
| |\
| | * SELinux: do not check open perms if they are not known to policyEric Paris2012-07-161-1/+1
| | * SELinux: include definition of new capabilitiesEric Paris2012-07-161-1/+3
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-051-0/+1
|\ \ | |/
| * security: Fix nommu build.Paul Mundt2012-07-031-0/+1
* | netlink: add netlink_kernel_cfg parameter to netlink_kernel_createPablo Neira Ayuso2012-06-291-1/+5
* | selinux: netlink: Move away from NLMSG_PUT().David S. Miller2012-06-261-4/+7
* | netfilter: selinux: switch hook PFs to nfprotoAlban Crequy2012-06-071-5/+5
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-06-017-72/+80
|\
| * take calculation of final prot in security_mmap_file() into a helperAl Viro2012-06-011-18/+28
| * take security_mmap_file() outside of ->mmap_semAl Viro2012-06-011-3/+30
| * split ->file_mmap() into ->mmap_addr()/->mmap_file()Al Viro2012-05-316-51/+30
| * split cap_mmap_addr() out of cap_file_mmap()Al Viro2012-05-314-12/+26
| * selinuxfs snprintf() misusesAl Viro2012-05-291-29/+7
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-05-313-51/+44
|\ \
| * | keys: change keyctl_session_to_parent() to use task_work_add()Oleg Nesterov2012-05-233-41/+44
| * | TIF_NOTIFY_RESUME is defined on all targets nowAl Viro2012-05-231-10/+0
| |/
* | aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()Christopher Yeoh2012-05-312-2/+2
* | kmod: convert two call sites to call_usermodehelper_fns()Boaz Harrosh2012-05-311-10/+3
* | 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