summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* security/integrity/ima/ima_policy.c: use %pU to output UUID in printable formatAndy Shevchenko2016-05-201-12/+2
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2016-05-1934-185/+909
|\
| * LSM: LoadPin: provide enablement CONFIGKees Cook2016-05-172-6/+15
| * Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux in...James Morris2016-05-065-60/+127
| |\
| | * selinux: apply execstack check on thread stacksStephen Smalley2016-04-261-2/+3
| | * selinux: distinguish non-init user namespace capability checksStephen Smalley2016-04-262-17/+25
| | * selinux: check ss_initialized before revalidating an inode labelPaul Moore2016-04-191-1/+1
| | * selinux: delay inode label lookup as long as possiblePaul Moore2016-04-191-8/+13
| | * selinux: don't revalidate an inode's label when explicitly setting itPaul Moore2016-04-191-2/+11
| | * selinux: Change bool variable name to index.Prarit Bhargava2016-04-142-4/+4
| | * selinux: restrict kernel module loadingJeff Vander Stoep2016-04-052-1/+48
| | * selinux: consolidate the ptrace parent lookup codePaul Moore2016-04-051-21/+17
| | * selinux: simply inode label states to INVALID and INITIALIZEDPaul Moore2016-04-052-4/+3
| | * selinux: don't revalidate inodes in selinux_socket_getpeersec_dgram()Paul Moore2016-04-051-3/+5
| * | Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2016-05-0619-112/+516
| |\ \
| | * \ Merge branch 'keys-trust' into keys-nextDavid Howells2016-05-0410-62/+128
| | |\ \
| | | * | IMA: Use the the system trusted keyrings instead of .ima_mokDavid Howells2016-04-114-53/+32
| | | * | KEYS: Remove KEY_FLAG_TRUSTED and KEY_ALLOC_TRUSTEDDavid Howells2016-04-113-39/+4
| | | * | KEYS: Move the point of trust determination to __key_link()David Howells2016-04-112-4/+35
| | | * | KEYS: Add a facility to restrict new links into a keyringDavid Howells2016-04-118-33/+124
| | | |/
| | * | KEYS: Add KEYCTL_DH_COMPUTE commandMat Martineau2016-04-126-0/+193
| | * | Security: Keys: Big keys stored encryptedKirill Marinushkin2016-04-122-18/+184
| | * | KEYS: user_update should use copy of payload made during preparsingDavid Howells2016-04-121-31/+11
| | * | security: integrity: Remove select to deleted option PUBLIC_KEY_ALGO_RSAAndreas Ziegler2016-04-121-1/+0
| * | | Yama: use atomic allocations when reportingSasha Levin2016-05-041-2/+2
| * | | ima: add support for creating files using the mknodat syscallMimi Zohar2016-05-012-1/+29
| * | | ima: fix ima_inode_post_setattrMimi Zohar2016-05-012-1/+2
| * | | LSM: LoadPin for kernel file loading restrictionsKees Cook2016-04-216-0/+205
| * | | Yama: consolidate error reportingKees Cook2016-04-211-10/+21
| |/ /
| * / security: drop the unused hook skb_owned_byPaolo Abeni2016-04-111-1/+0
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2016-05-171-1/+3
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-05-091-2/+2
| |\ \
| * | | rtnetlink: add new RTM_GETSTATS message to dump link statsRoopa Prabhu2016-04-201-1/+3
| | |/ | |/|
* | | Merge branch 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2016-05-1713-106/+83
|\ \ \
| * | | constify ima_d_path()Al Viro2016-03-282-2/+2
| * | | constify security_sb_pivotroot()Al Viro2016-03-282-2/+2
| * | | constify security_path_chroot()Al Viro2016-03-282-2/+2
| * | | constify security_path_{link,rename}Al Viro2016-03-283-9/+9
| * | | apparmor: remove useless checks for NULL ->mntAl Viro2016-03-281-2/+2
| * | | constify security_path_{mkdir,mknod,symlink}Al Viro2016-03-283-9/+9
| * | | constify security_path_{unlink,rmdir}Al Viro2016-03-283-6/+6
| * | | apparmor: constify common_perm_...()Al Viro2016-03-281-4/+4
| * | | apparmor: constify aa_path_link()Al Viro2016-03-282-2/+2
| * | | apparmor: new helper - common_path_perm()Al Viro2016-03-281-35/+12
| * | | constify chmod_common/security_path_chmodAl Viro2016-03-283-3/+3
| * | | constify security_sb_mount()Al Viro2016-03-283-3/+3
| * | | constify chown_common/security_path_chownAl Viro2016-03-283-3/+3
| * | | tomoyo: constify assorted struct path *Al Viro2016-03-283-13/+13
| * | | apparmor_path_truncate(): path->mnt is never NULLAl Viro2016-03-281-1/+1
| * | | constify security_path_truncate()Al Viro2016-03-283-3/+3