aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2012-01-233-0/+39
|\
| * keys: add a "logon" key typeJeff Layton2012-01-173-0/+39
* | keys: fix user_defined key sparse messagesMimi Zohar2012-01-181-3/+3
* | ima: fix cred sparse warningMimi Zohar2012-01-181-1/+2
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2012-01-179-22/+34
|\ \
| * | integrity: digital signature config option name changeDmitry Kasatkin2012-01-173-4/+4
| * | lib: digital signature config option name changeDmitry Kasatkin2012-01-171-1/+1
| * | encrypted-keys: fix rcu and sparse messagesMimi Zohar2012-01-172-2/+2
| * | keys: fix trusted/encrypted keys sparse rcu_assign_pointer messagesMimi Zohar2012-01-173-4/+6
| * | KEYS: Add missing smp_rmb() primitives to the keyring search codeDavid Howells2012-01-172-8/+18
| * | TOMOYO: Accept \000 as a valid character.Tetsuo Handa2012-01-171-3/+3
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-01-172-15/+20
|\ \ \ | |/ / |/| |
| * | audit: no leading space in audit_log_d_path prefixKees Cook2012-01-171-2/+2
| * | audit: treat s_id as an untrusted stringKees Cook2012-01-172-13/+18
| |/
* | Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2012-01-145-85/+27
|\ \
| * | security: remove the security_netlink_recv hook as it is equivalent to capable()Eric Paris2012-01-054-34/+0
| * | ptrace: do not audit capability check when outputing /proc/pid/statEric Paris2012-01-051-1/+1
| * | capabilities: remove all _real_ interfacesEric Paris2012-01-051-24/+0
| * | capabilities: introduce security_capable_noauditEric Paris2012-01-051-0/+6
| * | capabilities: reverse arguments to security_capableEric Paris2012-01-051-1/+1
| * | capabilities: remove the task from capable LSM hook entirelyEric Paris2012-01-054-30/+24
| * | selinux: sparse fix: fix several warnings in the security server codJames Morris2012-01-055-7/+9
| * | selinux: sparse fix: fix warnings in netlink codeJames Morris2012-01-056-5/+6
| * | selinux: sparse fix: eliminate warnings for selinuxfsJames Morris2012-01-053-6/+4
| * | selinux: sparse fix: declare selinux_disable() in security.hJames Morris2012-01-052-1/+1
| * | selinux: sparse fix: move selinux_complete_initJames Morris2012-01-052-1/+1
| * | selinux: sparse fix: make selinux_secmark_refcount staticJames Morris2012-01-051-1/+1
| * | SELinux: Fix RCU deref check warning in sel_netport_insert()David Howells2011-12-201-1/+3
* | | module_param: make bool parameters really bool (drivers & misc)Rusty Russell2012-01-122-11/+11
| |/ |/|
* | Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2012-01-1016-59/+259
|\ \
| * \ Merge branch 'next' into for-linusJames Morris2012-01-0816-59/+259
| |\ \
| | * | ima: fix invalid memory referenceRoberto Sassu2011-12-191-5/+11
| | * | ima: free duplicate measurement memoryRoberto Sassu2011-12-192-2/+3
| | * | selinux: Casting (void *) value returned by kmalloc is uselessThomas Meyer2011-12-181-1/+1
| | * | apparmor: fix module parameter handlingRusty Russell2011-12-151-3/+3
| | * | Security: tomoyo: add .gitignore fileGreg Kroah-Hartman2011-12-121-0/+2
| | * | tomoyo: add missing rcu_dereference()Kees Cook2011-12-121-1/+1
| | * | apparmor: add missing rcu_dereference()Kees Cook2011-12-081-1/+1
| | * | evm: prevent racing during tfm allocationDmitry Kasatkin2011-12-071-3/+11
| | * | evm: key must be set once during initializationDmitry Kasatkin2011-12-071-7/+8
| | * | digsig: build dependency fixDmitry Kasatkin2011-11-211-1/+1
| | * | Merge branch 'next-evm-digsig' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2011-11-187-30/+226
| | |\ \
| | | * | evm: digital signature verification supportDmitry Kasatkin2011-11-093-30/+142
| | | * | integrity: digital signature verification using multiple keyringsDmitry Kasatkin2011-11-094-0/+84
| | * | | KEYS: Give key types their own lockdep class for key->semDavid Howells2011-11-161-0/+3
| | * | | Merge branch 'master'; commit 'v3.2-rc2' into nextJames Morris2011-11-1510-7/+14
| | |\ \ \
| | * | | | selinuxfs: remove custom hex_to_bin()Andy Shevchenko2011-11-151-10/+4
* | | | | | securityfs: fix object creation racesAl Viro2012-01-101-141/+50
* | | | | | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-01-091-3/+4
|\ \ \ \ \ \
| * | | | | | cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_a...Tejun Heo2011-12-121-3/+4