diff options
| author | Kees Cook <keescook@chromium.org> | 2013-02-28 09:39:37 +0100 |
|---|---|---|
| committer | Tyler Hicks <tyhicks@canonical.com> | 2013-03-04 08:59:59 +0100 |
| commit | 290502bee239062499297916bb7d21d205e99d62 (patch) | |
| tree | a9ec1729138c7f71c1c4e3e09ce12cf40db767e3 /fs/ecryptfs/Makefile | |
| parent | eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid() (diff) | |
| download | linux-290502bee239062499297916bb7d21d205e99d62.tar.xz linux-290502bee239062499297916bb7d21d205e99d62.zip | |
eCryptfs: allow userspace messaging to be disabled
When the userspace messaging (for the less common case of userspace key
wrap/unwrap via ecryptfsd) is not needed, allow eCryptfs to build with
it removed. This saves on kernel code size and reduces potential attack
surface by removing the /dev/ecryptfs node.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/ecryptfs/Makefile')
| -rw-r--r-- | fs/ecryptfs/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ecryptfs/Makefile b/fs/ecryptfs/Makefile index 2cc9ee4ad2eb..49678a69947d 100644 --- a/fs/ecryptfs/Makefile +++ b/fs/ecryptfs/Makefile @@ -1,7 +1,10 @@ # -# Makefile for the Linux 2.6 eCryptfs +# Makefile for the Linux eCryptfs # obj-$(CONFIG_ECRYPT_FS) += ecryptfs.o -ecryptfs-objs := dentry.o file.o inode.o main.o super.o mmap.o read_write.o crypto.o keystore.o messaging.o miscdev.o kthread.o debug.o +ecryptfs-y := dentry.o file.o inode.o main.o super.o mmap.o read_write.o \ + crypto.o keystore.o kthread.o debug.o + +ecryptfs-$(CONFIG_ECRYPT_FS_MESSAGING) += messaging.o miscdev.o |