Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2830bfd6 authored by Eric Sandeen's avatar Eric Sandeen Committed by Linus Torvalds
Browse files

ecryptfs: remove debug as mount option, and warn if set via modprobe 



ecryptfs_debug really should not be a mount option; it is not per-mount,
but rather sets a global "ecryptfs_verbosity" variable which affects all
mounted filesysytems.  It's already settable as a module load option,
I think we can leave it at that.

Also, if set, since secret values come out in debug messages, kick
things off with a stern warning.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Acked-by: default avatarMike Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99db6e4a

fs/ecryptfs/main.c

+7 −16
Original line number Diff line number Diff line
@@ -226,17 +226,15 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry, 
	return rc;

}



enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig, ecryptfs_opt_debug,

       ecryptfs_opt_ecryptfs_debug, ecryptfs_opt_cipher,

       ecryptfs_opt_ecryptfs_cipher, ecryptfs_opt_ecryptfs_key_bytes,

enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig,

       ecryptfs_opt_cipher, ecryptfs_opt_ecryptfs_cipher,

       ecryptfs_opt_ecryptfs_key_bytes,

       ecryptfs_opt_passthrough, ecryptfs_opt_xattr_metadata,

       ecryptfs_opt_encrypted_view, ecryptfs_opt_err };



static match_table_t tokens = {

	{ecryptfs_opt_sig, "sig=%s"},

	{ecryptfs_opt_ecryptfs_sig, "ecryptfs_sig=%s"},

	{ecryptfs_opt_debug, "debug=%u"},

	{ecryptfs_opt_ecryptfs_debug, "ecryptfs_debug=%u"},

	{ecryptfs_opt_cipher, "cipher=%s"},

	{ecryptfs_opt_ecryptfs_cipher, "ecryptfs_cipher=%s"},

	{ecryptfs_opt_ecryptfs_key_bytes, "ecryptfs_key_bytes=%u"},
@@ -313,7 +311,6 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options) 
	substring_t args[MAX_OPT_ARGS];

	int token;

	char *sig_src;

	char *debug_src;

	char *cipher_name_dst;

	char *cipher_name_src;

	char *cipher_key_bytes_src;
@@ -341,16 +338,6 @@ static int ecryptfs_parse_options(struct super_block *sb, char *options) 
			}

			sig_set = 1;

			break;

		case ecryptfs_opt_debug:

		case ecryptfs_opt_ecryptfs_debug:

			debug_src = args[0].from;

			ecryptfs_verbosity =

				(int)simple_strtol(debug_src, &debug_src,

						   0);

			ecryptfs_printk(KERN_DEBUG,

					"Verbosity set to [%d]" "\n",

					ecryptfs_verbosity);

			break;

		case ecryptfs_opt_cipher:

		case ecryptfs_opt_ecryptfs_cipher:

			cipher_name_src = args[0].from;
@@ -816,6 +803,10 @@ static int __init ecryptfs_init(void) 
		       "rc = [%d]\n", rc);

		goto out_release_messaging;

	}

	if (ecryptfs_verbosity > 0)

		printk(KERN_CRIT "eCryptfs verbosity set to %d. Secret values "

			"will be written to the syslog!\n", ecryptfs_verbosity);



	goto out;

out_release_messaging:

	ecryptfs_release_messaging(ecryptfs_transport);

fs/ecryptfs/super.c

+0 −4
Original line number Diff line number Diff line
@@ -174,10 +174,6 @@ static int ecryptfs_show_options(struct seq_file *m, struct vfsmount *mnt) 
	}

	mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex);



	/* Note this is global and probably shouldn't be a mount option */

	if (ecryptfs_verbosity)

		seq_printf(m, ",ecryptfs_debug=%d\n", ecryptfs_verbosity);



	seq_printf(m, ",ecryptfs_cipher=%s",

		mount_crypt_stat->global_default_cipher_name);