Linus Torvalds ba1b7309fc Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ...

Pull smack update from James Morris:
 "From Casey:

    One simple patch that fixes a memory leak in kernfs and labeled NFS"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Fix memory leak in smack_inode_getsecctx

2018-06-07 15:57:04 -07:00

..

apparmor

Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

2018-04-13 15:38:53 -07:00

integrity

Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2018-06-07 15:40:37 -07:00

keys

Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2018-06-06 16:15:56 -07:00

loadpin

get rid of pointless includes of fs_struct.h

2018-02-22 14:28:50 -05:00

selinux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2018-06-06 18:39:49 -07:00

smack

Merge branch 'smack-for-4.18' of https://github.com/cschaufler/next-smack into next-smack

2018-06-05 13:18:58 -07:00

tomoyo

net: make getname() functions return length rather than use int* parameter

2018-02-12 14:15:04 -05:00

yama

pids: introduce find_get_task_by_vpid() helper

2018-02-06 18:32:46 -08:00

commoncap.c

capabilities: Allow privileged user in s_user_ns to set security.* xattrs

2018-05-24 12:03:31 -05:00

device_cgroup.c

device_cgroup: prepare code for bpf-based device controller

2017-11-05 23:26:51 +09:00

inode.c

securityfs: add the ability to support symlinks

2017-06-08 12:51:43 -07:00

Kconfig

Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

2018-02-03 16:25:42 -08:00

lsm_audit.c

audit: use inline function to get audit context

2018-05-14 17:24:18 -04:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

min_addr.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

security.c

security: add hook for socketpair()

2018-05-04 12:48:54 -07:00