diff options
author | Kees Cook <keescook@chromium.org> | 2011-12-21 15:17:04 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2012-02-09 17:18:52 -0500 |
commit | 2d514487faf188938a4ee4fb3464eeecfbdcf8eb (patch) | |
tree | 42147f0459ab062375f63891943242e3b95797bb /security/Makefile | |
parent | 1a2a4d06e1e95260c470ebe3a945f61bbe8c1fd8 (diff) |
security: Yama LSM
This adds the Yama Linux Security Module to collect DAC security
improvements (specifically just ptrace restrictions for now) that have
existed in various forms over the years and have been carried outside the
mainline kernel by other Linux distributions like Openwall and grsecurity.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
-rw-r--r-- | security/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/Makefile b/security/Makefile index a5e502f8a05b..c26c81e92571 100644 --- a/security/Makefile +++ b/security/Makefile | |||
@@ -7,6 +7,7 @@ subdir-$(CONFIG_SECURITY_SELINUX) += selinux | |||
7 | subdir-$(CONFIG_SECURITY_SMACK) += smack | 7 | subdir-$(CONFIG_SECURITY_SMACK) += smack |
8 | subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo | 8 | subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo |
9 | subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor | 9 | subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor |
10 | subdir-$(CONFIG_SECURITY_YAMA) += yama | ||
10 | 11 | ||
11 | # always enable default capabilities | 12 | # always enable default capabilities |
12 | obj-y += commoncap.o | 13 | obj-y += commoncap.o |
@@ -21,6 +22,7 @@ obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o | |||
21 | obj-$(CONFIG_AUDIT) += lsm_audit.o | 22 | obj-$(CONFIG_AUDIT) += lsm_audit.o |
22 | obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o | 23 | obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o |
23 | obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o | 24 | obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o |
25 | obj-$(CONFIG_SECURITY_YAMA) += yama/built-in.o | ||
24 | obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o | 26 | obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o |
25 | 27 | ||
26 | # Object integrity file lists | 28 | # Object integrity file lists |