[ 046/171] eCryptfs: check for eCryptfs cipher support at mount
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-11-22 22:13:43
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tim Sally <redacted> commit 5f5b331d5c21228a6519dcb793fc1629646c51a6 upstream. The issue occurs when eCryptfs is mounted with a cipher supported by the crypto subsystem but not by eCryptfs. The mount succeeds and an error does not occur until a write. This change checks for eCryptfs cipher support at mount time. Resolves Launchpad issue #338914, reported by Tyler Hicks in 03/2009. https://bugs.launchpad.net/ecryptfs/+bug/338914 Signed-off-by: Tim Sally <redacted> Signed-off-by: Tyler Hicks <redacted> Cc: Herton Ronaldo Krzesinski <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- fs/ecryptfs/main.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c@@ -280,6 +280,7 @@ static int ecryptfs_parse_options(struct char *fnek_src; char *cipher_key_bytes_src; char *fn_cipher_key_bytes_src; + u8 cipher_code; *check_ruid = 0;
@@ -421,6 +422,18 @@ static int ecryptfs_parse_options(struct && !fn_cipher_key_bytes_set) mount_crypt_stat->global_default_fn_cipher_key_bytes = mount_crypt_stat->global_default_cipher_key_size; + + cipher_code = ecryptfs_code_for_cipher_string( + mount_crypt_stat->global_default_cipher_name, + mount_crypt_stat->global_default_cipher_key_size); + if (!cipher_code) { + ecryptfs_printk(KERN_ERR, + "eCryptfs doesn't support cipher: %s", + mount_crypt_stat->global_default_cipher_name); + rc = -EINVAL; + goto out; + } + mutex_lock(&key_tfm_list_mutex); if (!ecryptfs_tfm_exists(mount_crypt_stat->global_default_cipher_name, NULL)) {