summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-10-092-8/+3
|\
| * mm: kill vma flag VM_RESERVED and mm->reserved_vm counterKonstantin Khlebnikov2012-10-091-1/+1
| * mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_fileKonstantin Khlebnikov2012-10-091-7/+2
* | Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...Linus Torvalds2012-10-091-1/+1
|\ \ | |/ |/|
| * UAPI: (Scripted) Disintegrate include/asm-genericDavid Howells2012-10-041-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2012-10-072-4/+4
|\ \
| * | ima: fix bug in argument orderDmitry Kasatkin2012-10-052-4/+4
| |/
* | device_cgroup: rename whitelist to exception listAristeu Rozanski2012-10-061-99/+99
* | device_cgroup: convert device_cgroup internally to policy + exceptionsAristeu Rozanski2012-10-061-98/+134
* | device_cgroup: introduce dev_whitelist_clean()Aristeu Rozanski2012-10-061-5/+17
* | device_cgroup: add "deny_all" in dev_cgroup structureAristeu Rozanski2012-10-061-0/+5
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-10-0217-228/+793
|\
| * Merge tag 'v3.6-rc7' into nextJames Morris2012-09-282-8/+3
| |\
| * | ima: change flags container data typeDmitry Kasatkin2012-09-191-1/+1
| * | Smack: setprocattr memory leak fixCasey Schaufler2012-09-181-12/+2
| * | Smack: implement revoking all rules for a subject labelRafal Krypa2012-09-181-0/+75
| * | Smack: remove task_wait() hook.Casey Schaufler2012-09-181-29/+8
| * | ima: audit log hashesPeter Moody2012-09-135-6/+55
| * | ima: generic IMA action flag handlingDmitry Kasatkin2012-09-134-19/+26
| * | ima: rename ima_must_appraise_or_measureDmitry Kasatkin2012-09-123-4/+4
| * | ima: digital signature verification supportDmitry Kasatkin2012-09-072-19/+52
| * | ima: add support for different security.ima data typesMimi Zohar2012-09-073-14/+17
| * | ima: add ima_inode_setxattr/removexattr function and callsMimi Zohar2012-09-072-0/+63
| * | ima: replace iint spinblock with rwlock/read_lockDmitry Kasatkin2012-09-071-9/+7
| * | ima: allocating iint improvementsDmitry Kasatkin2012-09-072-35/+23
| * | ima: add appraise action keywords and default rulesMimi Zohar2012-09-072-40/+116
| * | ima: integrity appraisal extensionMimi Zohar2012-09-0711-53/+351
| * | Yama: handle 32-bit userspace prctlKees Cook2012-09-081-1/+1
| * | security: allow Yama to be unconditionally stackedKees Cook2012-09-053-4/+39
| * | ima: enable the IBM vTPM as the default TPM in the PPC64 caseKent Yoder2012-08-221-0/+1
| * | tpm: Move tpm_get_random api into the TPM device driverKent Yoder2012-08-221-42/+12
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-10-021-52/+21
|\ \ \
| * | | make get_file() return its argumentAl Viro2012-09-261-2/+1
| * | | new helper: iterate_fd()Al Viro2012-09-261-35/+22
| * | | switch flush_unauthorized_files() to replace_fd()Al Viro2012-09-261-32/+15
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-10-021-3/+2
|\ \ \
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-09-281-0/+1
| |\| |
| * | | netlink: hide struct module parameter in netlink_kernel_createPablo Neira Ayuso2012-09-081-2/+1
| * | | netlink: kill netlink_set_nonrootPablo Neira Ayuso2012-09-081-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-10-0225-136/+148
|\ \ \ \
| * | | | userns: Teach security_path_chown to take kuids and kgidsEric W. Biederman2012-09-214-8/+10
| * | | | userns: Add user namespace support to IMAEric W. Biederman2012-09-212-9/+10
| * | | | userns: Convert EVM to deal with kuids and kgids in it's hmac computationEric W. Biederman2012-09-211-2/+2
| * | | | userns: Convert selinux to use kuid and kgid where appropriateEric W. Biederman2012-09-212-4/+4
| * | | | userns: Convert tomoyo to use kuid and kgid where appropriateEric W. Biederman2012-09-214-20/+31
| * | | | userns: Convert apparmor to use kuid and kgid where appropriateEric W. Biederman2012-09-214-10/+12
| * | | | userns: Convert security/keys to the new userns infrastructureEric W. Biederman2012-09-138-83/+79
* | | | | Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-10-021-0/+9
|\ \ \ \ \
| * | | | | cgroup: mark subsystems with broken hierarchy support and whine if cgroups ar...Tejun Heo2012-09-141-0/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-022-5/+5
|\ \ \ \ \