summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* smack: use pernet operations for hook registrationFlorian Westphal2017-06-011-8/+18
* Sync to mainline for security submaintainers to work againstJames Morris2017-05-2215-106/+63
|\
| * Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2017-05-093-4/+4
| |\
| | * fs: constify tree_descr arrays passed to simple_fill_super()Eric Biggers2017-04-263-4/+4
| * | apparmorfs: replace CURRENT_TIME with current_time()Deepa Dinamani2017-05-081-1/+1
| * | treewide: use kv[mz]alloc* rather than opencoded variantsMichal Hocko2017-05-081-16/+6
| * | mm: introduce kv[mz]alloc helpersMichal Hocko2017-05-085-44/+3
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2017-05-0341-590/+851
| |\ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-05-021-0/+1
| |\ \ \
| | * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-04-213-27/+39
| | |\ \ \
| | * | | | rtnetlink: Add RTM_DELNETCONFDavid Ahern2017-03-281-0/+1
| | | |_|/ | | |/| |
| * | | | Merge tag 'docs-4.12' of git://git.lwn.net/linuxLinus Torvalds2017-05-021-4/+8
| |\ \ \ \
| | * | | | kernel-api.rst: fix a series of errors when parsing C filesmchehab@s-opensource.com2017-04-021-4/+8
| | |/ / /
| * | | | Merge branch 'work.uaccess' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2017-05-012-10/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | HAVE_ARCH_HARDENED_USERCOPY is unconditional nowAl Viro2017-04-261-9/+0
| | * | | new helper: uaccess_kernel()Al Viro2017-03-281-1/+1
| | |/ /
| * | | KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyringsEric Biggers2017-04-182-24/+31
| * | | KEYS: Change the name of the dead type to ".dead" to prevent user accessDavid Howells2017-04-181-1/+1
| * | | KEYS: Disallow keyrings beginning with '.' to be joined as session keyringsDavid Howells2017-04-181-2/+7
| |/ /
* | | security: Grammar s/allocates/allocated/Geert Uytterhoeven2017-05-151-1/+1
* | | LSM: Enable multiple calls to security_add_hooks() for the same LSMMickaël Salaün2017-05-151-0/+19
| |/ |/|
* | 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-061-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-041-1/+1
| * | | smack: fix double free in smack_parse_opts_str()Tetsuo Handa2017-04-041-3/+1
* | | | Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2017-04-198-60/+57
|\ \ \ \
| * | | | 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-291-1/+1
| * | | | 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