summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2017-05-0395-1120/+3240
|\
| * tpm: Fix reference count to main deviceStefan Berger2017-04-241-2/+3
| * tpm_tis: convert to using locality callbacksJerry Snitselaar2017-04-241-26/+8
| * tpm: fix handling of the TPM 2.0 event logsPetr Vandrovec2017-04-241-4/+10
| * tpm_crb: remove a cruft constantJarkko Sakkinen2017-04-242-4/+1
| * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2017-04-192-34/+94
| |\
| | * ima: provide ">" and "<" operators for fowner/uid/euid rules.Mikhail Kurinnoi2017-03-131-28/+87
| | * ima: accept previously set IMA_NEW_FILEDaniel Glöckner2017-03-071-2/+3
| | * integrity: mark default IMA rules as __ro_after_initJames Morris2017-03-071-4/+4
| * | Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into ...James Morris2017-04-192-4/+2
| |\ \
| | * | Smack: Use GFP_KERNEL for smk_netlbl_mls().Tetsuo Handa2017-04-051-1/+1
| | * | smack: fix double free in smack_parse_opts_str()Tetsuo Handa2017-04-051-3/+1
| * | | Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2017-04-1911-70/+69
| |\ \ \
| | * | | selinux: Fix an uninitialized variable bugDan Carpenter2017-03-311-1/+1
| | * | | selinux: Remove unnecessary check of array base in selinux_set_mapping()Matthias Kaehlcke2017-03-301-1/+1
| | * | | fs: switch order of CAP_DAC_OVERRIDE and CAP_DAC_READ_SEARCH checksStephen Smalley2017-03-291-10/+10
| | * | | selinuxfs: Use seq_puts() in sel_avc_stats_seq_show()Markus Elfring2017-03-291-4/+4
| | * | | selinux: Adjust two checks for null pointersMarkus Elfring2017-03-291-2/+2
| | * | | selinux: Use kmalloc_array() in sidtab_init()Markus Elfring2017-03-291-1/+1
| | * | | selinux: Return directly after a failed kzalloc() in roles_init()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in perm_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in common_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in class_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in role_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in type_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in user_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Improve another size determination in sens_read()Markus Elfring2017-03-291-1/+1
| | * | | selinux: Return directly after a failed kzalloc() in sens_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Return directly after a failed kzalloc() in cat_read()Markus Elfring2017-03-291-2/+1
| | * | | selinux: Delete an unnecessary variable initialisation in range_read()Markus Elfring2017-03-231-1/+1
| | * | | selinux: Return directly after a failed next_entry() in range_read()Markus Elfring2017-03-231-1/+1
| | * | | selinux: Delete an unnecessary variable assignment in filename_trans_read()Markus Elfring2017-03-231-1/+0
| | * | | selinux: One function call less in genfs_read() after null pointer detectionMarkus Elfring2017-03-231-2/+3
| | * | | selinux: Return directly after a failed next_entry() in genfs_read()Markus Elfring2017-03-231-1/+1
| | * | | selinux: Delete an unnecessary return statement in policydb_destroy()Markus Elfring2017-03-231-2/+0
| | * | | selinux: Use kcalloc() in policydb_index()Markus Elfring2017-03-231-9/+9
| | * | | selinux: Adjust four checks for null pointersMarkus Elfring2017-03-231-4/+4
| | * | | selinux: Use kmalloc_array() in hashtab_create()Markus Elfring2017-03-231-1/+1
| | * | | selinux: Improve size determinations in four functionsMarkus Elfring2017-03-231-4/+4
| | * | | selinux: Delete an unnecessary return statement in cond_compute_av()Markus Elfring2017-03-231-1/+0
| | * | | selinux: Use kmalloc_array() in cond_init_bool_indexes()Markus Elfring2017-03-231-2/+3
| | * | | selinux: check for address length in selinux_socket_bind()Alexander Potapenko2017-03-101-0/+8
| | * | | selinux: include sys/socket.h in host programs to have PF_MAXNicolas Iooss2017-03-102-0/+2
| | * | | selinux: constify nlmsg permission tablesJames Morris2017-03-061-5/+5
| | | |/ | | |/|
| * | | Merge tag 'keys-next-20170412' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2017-04-1733-116/+1305
| |\ \ \
| | * | | keys: select CONFIG_CRYPTO when selecting DH / KDFStephan Müller2017-04-121-0/+1
| | * | | KEYS: add SP800-56A KDF support for DHStephan Mueller2017-04-0410-26/+315
| | * | | Merge branch 'keyctl-restrict' of git://git.kernel.org/pub/scm/linux/kernel/g...David Howells2017-04-0418-82/+724
| | |\ \ \
| | | * | | KEYS: Keyring asymmetric key restrict method with chainingMat Martineau2017-04-044-46/+155
| | | * | | KEYS: Restrict asymmetric key linkage using a specific keychainMat Martineau2017-04-044-1/+121