diff options
| author | Casey Schaufler <casey@schaufler-ca.com> | 2015-05-03 00:10:46 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-05-12 07:00:16 +0200 |
| commit | 3c4ed7bdf5997d8020cbb8d4abbef2fcfb9f1284 (patch) | |
| tree | 6137d6577f72d7f15b2693b44a973bc94cad1b6e /security | |
| parent | Linux 4.1-rc1 (diff) | |
| download | linux-3c4ed7bdf5997d8020cbb8d4abbef2fcfb9f1284.tar.xz linux-3c4ed7bdf5997d8020cbb8d4abbef2fcfb9f1284.zip | |
LSM: Split security.h
The security.h header file serves two purposes,
interfaces for users of the security modules and
interfaces for security modules. Users of the
security modules don't need to know about what's
in the security_operations structure, so pull it
out into it's own header, lsm_hooks.h
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Paul Moore <paul@paul-moore.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/lsm.c | 2 | ||||
| -rw-r--r-- | security/capability.c | 2 | ||||
| -rw-r--r-- | security/security.c | 2 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 2 | ||||
| -rw-r--r-- | security/smack/smack.h | 2 | ||||
| -rw-r--r-- | security/tomoyo/tomoyo.c | 2 | ||||
| -rw-r--r-- | security/yama/yama_lsm.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index e5f1561439db..fead41bd0440 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -12,7 +12,7 @@ * License. */ -#include <linux/security.h> +#include <linux/lsm_hooks.h> #include <linux/moduleparam.h> #include <linux/mm.h> #include <linux/mman.h> diff --git a/security/capability.c b/security/capability.c index 0d03fcc489a4..513015feffd7 100644 --- a/security/capability.c +++ b/security/capability.c @@ -10,7 +10,7 @@ * */ -#include <linux/security.h> +#include <linux/lsm_hooks.h> static int cap_binder_set_context_mgr(struct task_struct *mgr) { diff --git a/security/security.c b/security/security.c index 8e9b1f4b9b45..9c95fe0c8d75 100644 --- a/security/security.c +++ b/security/security.c @@ -16,7 +16,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/security.h> +#include <linux/lsm_hooks.h> #include <linux/integrity.h> #include <linux/ima.h> #include <linux/evm.h> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 7dade28affba..40e3f7757ec7 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -29,7 +29,7 @@ #include <linux/tracehook.h> #include <linux/errno.h> #include <linux/sched.h> -#include <linux/security.h> +#include <linux/lsm_hooks.h> #include <linux/xattr.h> #include <linux/capability.h> #include <linux/unistd.h> diff --git a/security/smack/smack.h b/security/smack/smack.h index 49eada6266ec..262dad8dfbc6 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -15,7 +15,7 @@ #include <linux/capability.h> #include <linux/spinlock.h> -#include <linux/security.h> +#include <linux/lsm_hooks.h> #include <linux/in.h> #include <net/netlabel.h> #include <linux/list.h> diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 57c88d52ffa5..2f7b46855f48 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c @@ -4,7 +4,7 @@ * Copyright (C) 2005-2011 NTT DATA CORPORATION */ -#include <linux/security.h> +#include <linux/lsm_hooks.h> #include "common.h" /** diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index 24aae2ae2b30..14557ffa7b4d 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -12,7 +12,7 @@ * */ -#include <linux/security.h> +#include <linux/lsm_hooks.h> #include <linux/sysctl.h> #include <linux/ptrace.h> #include <linux/prctl.h> |