aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v3.0.58' into android-3.0Todd Poynor2013-01-151-1/+2
|\
| * selinux: fix sel_netnode_insert() suspicious rcu dereferenceDave Jones2012-11-261-1/+2
* | Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0Todd Poynor2012-11-011-0/+1
|\|
| * SELinux: if sel_make_bools errors don't leave inconsistent stateEric Paris2012-06-011-0/+1
* | Merge commit 'v3.0.30' into android-3.0Todd Poynor2012-04-301-0/+6
|\|
| * security: fix compile error in commoncap.cJonghwan Choi2012-04-221-0/+1
| * fcaps: clear the same personality flags as suid when fcaps are usedEric Paris2012-04-221-0/+5
* | Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-197-57/+83
|\|
| * TOMOYO: Fix mount flags checking order.Tetsuo Handa2012-04-131-18/+20
| * ima: fix invalid memory referenceRoberto Sassu2012-01-251-5/+11
| * ima: free duplicate measurement memoryRoberto Sassu2012-01-252-2/+3
| * SELinux: Fix RCU deref check warning in sel_netport_insert()David Howells2012-01-061-1/+3
| * fix apparmor dereferencing potentially freed dentry, sanitize __d_path() APIAl Viro2011-12-212-30/+44
| * KEYS: Fix a NULL pointer deref in the user-defined key typeDavid Howells2011-11-211-1/+2
* | Merge commit 'v3.0.1' into android-3.0Colin Cross2011-08-102-2/+2
|\|
| * AppArmor: Fix masking of capabilities in complain modeJohn Johansen2011-08-041-1/+1
| * AppArmor: Fix reference to rcu protected pointer outside of rcu_read_lockJohn Johansen2011-08-041-1/+1
* | Merge commit 'v3.0-rc5' into android-3.0Colin Cross2011-06-295-12/+44
|\|
| * KEYS: Fix error handling in construct_key_and_link()David Howells2011-06-211-1/+2
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2011-06-201-7/+1
| |\
| | * devcgroup_inode_permission: take "is it a device node" checks to inlined wrapperAl Viro2011-06-201-7/+1
| * | KEYS/DNS: Fix ____call_usermodehelper() to not lose the session keyringDavid Howells2011-06-171-2/+1
| |/
| * Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into...James Morris2011-06-142-1/+39
| |\
| | * SELinux: skip file_name_trans_write() when policy downgraded.Roy.Li2011-06-141-0/+3
| | * selinux: fix case of names with whitespace/multibytes on /selinux/createKohei Kaigai2011-05-261-1/+36
| | * Merge commit 'v2.6.39' into 20110526Eric Paris2011-05-2616-64/+148
| | |\
| * | | TOMOYO: Fix oops in tomoyo_mount_acl().Tetsuo Handa2011-06-141-1/+1
* | | | security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().Chia-chi Yeh2011-06-141-0/+9
|/ / /
* | | AppArmor: Fix sleep in invalid context from task_setrlimitJohn Johansen2011-06-081-1/+1
* | | selinux: simplify and clean up inode_has_perm()Linus Torvalds2011-06-081-10/+15
* | | AppArmor: fix oops in apparmor_setprocattrKees Cook2011-05-311-1/+2
* | | Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdu...Linus Torvalds2011-05-276-7/+7
|\ \ \
| * | | Create Documentation/security/,Randy Dunlap2011-05-196-7/+7
| | |/ | |/|
* | | selinux: don't pass in NULL avd to avc_has_perm_noauditLinus Torvalds2011-05-262-11/+4
* | | cgroups: add per-thread subsystem callbacksBen Blum2011-05-261-2/+1
* | | Set cred->user_ns in key_replace_session_keyringSerge E. Hallyn2011-05-261-0/+1
* | | Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into fo...James Morris2011-05-2411-208/+370
|\ \ \ | | |/ | |/|
| * | SELINUX: add /sys/fs/selinux mount point to put selinuxfsGreg Kroah-Hartman2011-05-111-1/+11
| * | SELinux: introduce path_has_permEric Paris2011-04-281-14/+30
| * | flex_array: flex_array_prealloc takes a number of elements, not an endEric Paris2011-04-281-3/+3
| * | SELinux: pass last path component in may_createEric Paris2011-04-281-1/+2
| * | SELinux: put name based create rules in a hashtableEric Paris2011-04-283-61/+135
| * | SELinux: generic hashtab entry counterEric Paris2011-04-281-2/+2
| * | SELinux: calculate and print hashtab stats with a generic functionEric Paris2011-04-281-19/+13
| * | SELinux: skip filename trans rules if ttype does not match parent dirEric Paris2011-04-283-0/+17
| * | SELinux: rename filename_compute_type argument to *type instead of *conEric Paris2011-04-281-3/+3
| * | SELinux: fix comment to state filename_compute_type takes an objname not a qstrEric Paris2011-04-281-1/+1
| * | SMACK: smack_file_lock can use the struct pathEric Paris2011-04-251-2/+2
| * | LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATHEric Paris2011-04-254-42/+50
| * | LSM: split LSM_AUDIT_DATA_FS into _PATH and _INODEEric Paris2011-04-255-68/+74