linux-kernel - [PATCH] eCryptfs: fix compile error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1311958266-3724-1-git-send-email-roberto.sassu@polito.it>
Date:	Fri, 29 Jul 2011 18:51:04 +0200
From:	Roberto Sassu <roberto.sassu@...ito.it>
To:	linux-fsdevel@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, tyhicks@...ux.vnet.ibm.com,
	kirkland@...onical.com, ecryptfs-devel@...ts.launchpad.net,
	hilld@...arystorm.net, Roberto Sassu <roberto.sassu@...ito.it>
Subject: [PATCH] eCryptfs: fix compile error

This patch fixes the compile error reported at the address:

https://bugzilla.kernel.org/show_bug.cgi?id=40292

The problem arises when compiling eCryptfs as built-in and the 'encrypted'
key type as a module. The patch enables the 'encrypted' key type support
for eCryptfs only when both components are compiled as built-in, both as
modules or eCryptfs as a module and the 'encrypted' key type as built-in.

Signed-off-by: Roberto Sassu <roberto.sassu@...ito.it>
Reported-by: David Hill <hilld@...arystorm.net>
---
 fs/ecryptfs/ecryptfs_kernel.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index b36c557..a2da660 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -79,7 +79,9 @@ struct ecryptfs_page_crypt_context {
 	} param;
 };
 
-#if defined(CONFIG_ENCRYPTED_KEYS) || defined(CONFIG_ENCRYPTED_KEYS_MODULE)
+#if (defined(CONFIG_ECRYPT_FS) && defined(CONFIG_ENCRYPTED_KEYS)) || \
+	(defined(CONFIG_ECRYPT_FS_MODULE) && \
+	(defined(CONFIG_ENCRYPTED_KEYS) || defined(CONFIG_ENCRYPTED_KEYS_MODULE)))
 static inline struct ecryptfs_auth_tok *
 ecryptfs_get_encrypted_key_payload_data(struct key *key)
 {
-- 
1.7.6


Download attachment "smime.p7s" of type "application/x-pkcs7-signature" (2061 bytes)