aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 4.9.61 into android-4.9-oGreg Kroah-Hartman2017-11-081-20/+19
|\
| * KEYS: return full count in keyring_read() if buffer is too smallEric Biggers2017-11-081-20/+19
* | Merge 4.9.59 into android-4.9-oGreg Kroah-Hartman2017-10-3012-39/+66
|\|
| * KEYS: Fix race between updating and finding a negative keyDavid Howells2017-10-2712-39/+49
| * KEYS: don't let add_key() update an uninstantiated keyDavid Howells2017-10-271-0/+10
| * KEYS: encrypted: fix dereference of NULL user_key_payloadEric Biggers2017-10-271-0/+7
* | Merge 4.9.55 into android-4.9-oGreg Kroah-Hartman2017-10-121-30/+25
|\|
| * lsm: fix smack_inode_removexattr and xattr_getsecurity memleakCasey Schaufler2017-10-121-30/+25
* | Merge 4.9.53 into android-4.9-oGreg Kroah-Hartman2017-10-057-98/+96
|\|
| * KEYS: prevent KEYCTL_READ on negative keyEric Biggers2017-10-051-0/+5
| * KEYS: prevent creating a different user's keyringsEric Biggers2017-10-054-12/+21
| * KEYS: fix writing past end of user-supplied buffer in keyring_read()Eric Biggers2017-10-051-9/+5
| * security/keys: rewrite all of big_key cryptoJason A. Donenfeld2017-10-052-71/+59
| * security/keys: properly zero out sensitive key material in big_keyJason A. Donenfeld2017-10-051-6/+6
* | Merge 4.9.37 into android-4.9Greg Kroah-Hartman2017-07-121-1/+1
|\|
| * KEYS: Fix an error code in request_master_key()Dan Carpenter2017-07-121-1/+1
* | UPSTREAM: selinux: enable genfscon labeling for tracefsJeff Vander Stoep2017-06-301-0/+1
* | Merge 4.9.32 into android-4.9Greg Kroah-Hartman2017-06-143-13/+13
|\|
| * KEYS: encrypted: avoid encrypting/decrypting stack buffersEric Biggers2017-06-141-8/+9
| * KEYS: fix freeing uninitialized memory in key_update()Eric Biggers2017-06-141-3/+2
| * KEYS: fix dereferencing NULL payload with nonzero lengthEric Biggers2017-06-141-2/+2
* | Merge 4.9.30 into android-4.9Greg Kroah-Hartman2017-05-251-2/+3
|\|
| * ima: accept previously set IMA_NEW_FILEDaniel Glöckner2017-05-251-2/+3
* | Merge 4.9.25 into android-4.9Greg Kroah-Hartman2017-04-273-27/+39
|\|
| * KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyringsEric Biggers2017-04-272-24/+31
| * KEYS: Change the name of the dead type to ".dead" to prevent user accessDavid Howells2017-04-271-1/+1
| * KEYS: Disallow keyrings beginning with '.' to be joined as session keyringsDavid Howells2017-04-271-2/+7
* | ANDROID: export security_path_chownDaniel Rosenberg2017-03-211-0/+1
* | ima: fix ima_d_path() possible race with renameMimi Zohar2017-03-123-6/+24
|\|
| * ima: fix ima_d_path() possible race with renameMimi Zohar2017-03-113-6/+24
* | Merge tag 'v4.9.10' into android-4.9-aospDmitry Shmidt2017-02-151-1/+1
|\|
| * selinux: fix off-by-one in setprocattrStephen Smalley2017-02-141-1/+1
* | Merge tag 'v4.9.6' into android-4.9Dmitry Shmidt2017-01-311-1/+1
|\|
| * ima: fix memory leak in ima_release_policyEric Richter2017-01-121-1/+1
* | ANDROID: vfs: Add permission2 for filesystems with per mount permissionsDaniel Rosenberg2017-01-311-1/+1
* | FROMLIST: security,perf: Allow further restriction of perf_event_openJeff Vander Stoep2017-01-271-0/+9
* | ANDROID: quick selinux support for tracefsYongqin Liu2017-01-271-0/+1
* | ANDROID: security: Add proper checks for Android specific capability checksTushar Behera2017-01-271-0/+2
* | ANDROID: security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_...Chia-chi Yeh2017-01-191-0/+9
|/
* apparmor: fix change_hat not finding hat after policy replacementJohn Johansen2016-11-211-2/+4
* security/keys: make BIG_KEYS dependent on stdrng.Artem Savkov2016-10-271-1/+1
* KEYS: Sort out big_key initialisationDavid Howells2016-10-271-27/+32
* KEYS: Fix short sprintf buffer in /proc/keys show functionDavid Howells2016-10-271-1/+1
* Merge branch 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2016-10-221-1/+1
|\
| * mm: Change vm_is_stack_for_task() to vm_is_stack_for_current()Andy Lutomirski2016-10-201-1/+1
* | mm: replace get_user_pages_remote() write/force parameters with gup_flagsLorenzo Stoakes2016-10-191-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-10-104-5/+5
|\
| * Merge remote-tracking branch 'ovl/rename2' into for-linusAl Viro2016-10-102-6/+9
| |\
| | * fs: rename "rename2" i_op to "rename"Miklos Szeredi2016-09-271-2/+2
| | * vfs: remove unused i_op->renameMiklos Szeredi2016-09-271-2/+2