Commit 6b5717bd authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: implement -o test_dummy_encryption mount option 



Add support for the test_dummy_encryption mount option. This allows us
to test the encrypted codepaths in ceph without having to manually set
keys, etc.

[ lhenriques: fix potential fsc->fsc_dummy_enc_policy memory leak in
  ceph_real_mount() ]

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: default avatarLuís Henriques <lhenriques@suse.de>
Reviewed-by: default avatarMilind Changire <mchangir@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 2d332d5b

fs/ceph/crypto.c

+56 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/fscrypt.h>



#include "super.h"

#include "mds_client.h"

#include "crypto.h"



static int ceph_crypt_get_context(struct inode *inode, void *ctx, size_t len)
@@ -65,9 +66,15 @@ static bool ceph_crypt_empty_dir(struct inode *inode) 
	return ci->i_rsubdirs + ci->i_rfiles == 1;

}



static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)

{

	return ceph_sb_to_client(sb)->fsc_dummy_enc_policy.policy;

}



static struct fscrypt_operations ceph_fscrypt_ops = {

	.get_context		= ceph_crypt_get_context,

	.set_context		= ceph_crypt_set_context,

	.get_dummy_policy	= ceph_get_dummy_policy,

	.empty_dir		= ceph_crypt_empty_dir,

};
@@ -75,3 +82,52 @@ void ceph_fscrypt_set_ops(struct super_block *sb) 
{

	fscrypt_set_ops(sb, &ceph_fscrypt_ops);

}



void ceph_fscrypt_free_dummy_policy(struct ceph_fs_client *fsc)

{

	fscrypt_free_dummy_policy(&fsc->fsc_dummy_enc_policy);

}



int ceph_fscrypt_prepare_context(struct inode *dir, struct inode *inode,

				 struct ceph_acl_sec_ctx *as)

{

	int ret, ctxsize;

	bool encrypted = false;

	struct ceph_inode_info *ci = ceph_inode(inode);



	ret = fscrypt_prepare_new_inode(dir, inode, &encrypted);

	if (ret)

		return ret;

	if (!encrypted)

		return 0;



	as->fscrypt_auth = kzalloc(sizeof(*as->fscrypt_auth), GFP_KERNEL);

	if (!as->fscrypt_auth)

		return -ENOMEM;



	ctxsize = fscrypt_context_for_new_inode(as->fscrypt_auth->cfa_blob,

						inode);

	if (ctxsize < 0)

		return ctxsize;



	as->fscrypt_auth->cfa_version = cpu_to_le32(CEPH_FSCRYPT_AUTH_VERSION);

	as->fscrypt_auth->cfa_blob_len = cpu_to_le32(ctxsize);



	WARN_ON_ONCE(ci->fscrypt_auth);

	kfree(ci->fscrypt_auth);

	ci->fscrypt_auth_len = ceph_fscrypt_auth_len(as->fscrypt_auth);

	ci->fscrypt_auth = kmemdup(as->fscrypt_auth, ci->fscrypt_auth_len,

				   GFP_KERNEL);

	if (!ci->fscrypt_auth)

		return -ENOMEM;



	inode->i_flags |= S_ENCRYPTED;



	return 0;

}



void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req,

				struct ceph_acl_sec_ctx *as)

{

	swap(req->r_fscrypt_auth, as->fscrypt_auth);

}

fs/ceph/crypto.h

+28 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 


#include <linux/fscrypt.h>



struct ceph_fs_client;

struct ceph_acl_sec_ctx;

struct ceph_mds_request;



struct ceph_fscrypt_auth {

	__le32	cfa_version;

	__le32	cfa_blob_len;
@@ -25,12 +29,36 @@ static inline u32 ceph_fscrypt_auth_len(struct ceph_fscrypt_auth *fa) 
#ifdef CONFIG_FS_ENCRYPTION

void ceph_fscrypt_set_ops(struct super_block *sb);



void ceph_fscrypt_free_dummy_policy(struct ceph_fs_client *fsc);



int ceph_fscrypt_prepare_context(struct inode *dir, struct inode *inode,

				 struct ceph_acl_sec_ctx *as);

void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req,

				struct ceph_acl_sec_ctx *as);



#else /* CONFIG_FS_ENCRYPTION */



static inline void ceph_fscrypt_set_ops(struct super_block *sb)

{

}



static inline void ceph_fscrypt_free_dummy_policy(struct ceph_fs_client *fsc)

{

}



static inline int ceph_fscrypt_prepare_context(struct inode *dir,

					       struct inode *inode,

					       struct ceph_acl_sec_ctx *as)

{

	if (IS_ENCRYPTED(dir))

		return -EOPNOTSUPP;

	return 0;

}



static inline void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req,

						struct ceph_acl_sec_ctx *as_ctx)

{

}

#endif /* CONFIG_FS_ENCRYPTION */



#endif

fs/ceph/inode.c

+8 −2
Original line number Diff line number Diff line
@@ -83,12 +83,17 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry, 
			goto out_err;

	}



	inode->i_state = 0;

	inode->i_mode = *mode;



	err = ceph_security_init_secctx(dentry, *mode, as_ctx);

	if (err < 0)

		goto out_err;



	inode->i_state = 0;

	inode->i_mode = *mode;

	err = ceph_fscrypt_prepare_context(dir, inode, as_ctx);

	if (err)

		goto out_err;



	return inode;

out_err:

	iput(inode);
@@ -102,6 +107,7 @@ void ceph_as_ctx_to_req(struct ceph_mds_request *req, 
		req->r_pagelist = as_ctx->pagelist;

		as_ctx->pagelist = NULL;

	}

	ceph_fscrypt_as_ctx_to_req(req, as_ctx);

}



/**

fs/ceph/super.c

+83 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static void ceph_put_super(struct super_block *s) 
	struct ceph_fs_client *fsc = ceph_sb_to_client(s);



	dout("put_super\n");

	ceph_fscrypt_free_dummy_policy(fsc);

	ceph_mdsc_close_sessions(fsc->mdsc);

}
@@ -152,6 +153,7 @@ enum { 
	Opt_recover_session,

	Opt_source,

	Opt_mon_addr,

	Opt_test_dummy_encryption,

	/* string args above */

	Opt_dirstat,

	Opt_rbytes,
@@ -194,6 +196,7 @@ static const struct fs_parameter_spec ceph_mount_parameters[] = { 
	fsparam_string	("fsc",				Opt_fscache), // fsc=...

	fsparam_flag_no ("ino32",			Opt_ino32),

	fsparam_string	("mds_namespace",		Opt_mds_namespace),

	fsparam_string	("mon_addr",			Opt_mon_addr),

	fsparam_flag_no ("poolperm",			Opt_poolperm),

	fsparam_flag_no ("quotadf",			Opt_quotadf),

	fsparam_u32	("rasize",			Opt_rasize),
@@ -205,7 +208,8 @@ static const struct fs_parameter_spec ceph_mount_parameters[] = { 
	fsparam_u32	("rsize",			Opt_rsize),

	fsparam_string	("snapdirname",			Opt_snapdirname),

	fsparam_string	("source",			Opt_source),

	fsparam_string	("mon_addr",			Opt_mon_addr),

	fsparam_flag	("test_dummy_encryption",	Opt_test_dummy_encryption),

	fsparam_string	("test_dummy_encryption",	Opt_test_dummy_encryption),

	fsparam_u32	("wsize",			Opt_wsize),

	fsparam_flag_no	("wsync",			Opt_wsync),

	fsparam_flag_no	("pagecache",			Opt_pagecache),
@@ -585,6 +589,23 @@ static int ceph_parse_mount_param(struct fs_context *fc, 
		else

			fsopt->flags |= CEPH_MOUNT_OPT_SPARSEREAD;

		break;

	case Opt_test_dummy_encryption:

#ifdef CONFIG_FS_ENCRYPTION

		fscrypt_free_dummy_policy(&fsopt->dummy_enc_policy);

		ret = fscrypt_parse_test_dummy_encryption(param,

						&fsopt->dummy_enc_policy);

		if (ret == -EINVAL) {

			warnfc(fc, "Value of option \"%s\" is unrecognized",

			       param->key);

		} else if (ret == -EEXIST) {

			warnfc(fc, "Conflicting test_dummy_encryption options");

			ret = -EINVAL;

		}

#else

		warnfc(fc,

		       "FS encryption not supported: test_dummy_encryption mount option ignored");

#endif

		break;

	default:

		BUG();

	}
@@ -605,6 +626,7 @@ static void destroy_mount_options(struct ceph_mount_options *args) 
	kfree(args->server_path);

	kfree(args->fscache_uniq);

	kfree(args->mon_addr);

	fscrypt_free_dummy_policy(&args->dummy_enc_policy);

	kfree(args);

}
@@ -724,6 +746,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) 
	if (fsopt->flags & CEPH_MOUNT_OPT_SPARSEREAD)

		seq_puts(m, ",sparseread");



	fscrypt_show_test_dummy_encryption(m, ',', root->d_sb);



	if (fsopt->wsize != CEPH_MAX_WRITE_SIZE)

		seq_printf(m, ",wsize=%u", fsopt->wsize);

	if (fsopt->rsize != CEPH_MAX_READ_SIZE)
@@ -1062,6 +1086,50 @@ static struct dentry *open_root_dentry(struct ceph_fs_client *fsc, 
	return root;

}



#ifdef CONFIG_FS_ENCRYPTION

static int ceph_apply_test_dummy_encryption(struct super_block *sb,

					    struct fs_context *fc,

					    struct ceph_mount_options *fsopt)

{

	struct ceph_fs_client *fsc = sb->s_fs_info;



	if (!fscrypt_is_dummy_policy_set(&fsopt->dummy_enc_policy))

		return 0;



	/* No changing encryption context on remount. */

	if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE &&

	    !fscrypt_is_dummy_policy_set(&fsc->fsc_dummy_enc_policy)) {

		if (fscrypt_dummy_policies_equal(&fsopt->dummy_enc_policy,

						 &fsc->fsc_dummy_enc_policy))

			return 0;

		errorfc(fc, "Can't set test_dummy_encryption on remount");

		return -EINVAL;

	}



	/* Also make sure fsopt doesn't contain a conflicting value. */

	if (fscrypt_is_dummy_policy_set(&fsc->fsc_dummy_enc_policy)) {

		if (fscrypt_dummy_policies_equal(&fsopt->dummy_enc_policy,

						 &fsc->fsc_dummy_enc_policy))

			return 0;

		errorfc(fc, "Conflicting test_dummy_encryption options");

		return -EINVAL;

	}



	fsc->fsc_dummy_enc_policy = fsopt->dummy_enc_policy;

	memset(&fsopt->dummy_enc_policy, 0, sizeof(fsopt->dummy_enc_policy));



	warnfc(fc, "test_dummy_encryption mode enabled");

	return 0;

}

#else

static int ceph_apply_test_dummy_encryption(struct super_block *sb,

					    struct fs_context *fc,

					    struct ceph_mount_options *fsopt)

{

	return 0;

}

#endif



/*

 * mount: join the ceph cluster, and open root directory.

 */
@@ -1090,6 +1158,11 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, 
				goto out;

		}



		err = ceph_apply_test_dummy_encryption(fsc->sb, fc,

						       fsc->mount_options);

		if (err)

			goto out;



		dout("mount opening path '%s'\n", path);



		ceph_fs_debugfs_init(fsc);
@@ -1111,6 +1184,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc, 


out:

	mutex_unlock(&fsc->client->mount_mutex);

	ceph_fscrypt_free_dummy_policy(fsc);

	return ERR_PTR(err);

}
@@ -1299,9 +1373,15 @@ static void ceph_free_fc(struct fs_context *fc) 


static int ceph_reconfigure_fc(struct fs_context *fc)

{

	int err;

	struct ceph_parse_opts_ctx *pctx = fc->fs_private;

	struct ceph_mount_options *fsopt = pctx->opts;

	struct ceph_fs_client *fsc = ceph_sb_to_client(fc->root->d_sb);

	struct super_block *sb = fc->root->d_sb;

	struct ceph_fs_client *fsc = ceph_sb_to_client(sb);



	err = ceph_apply_test_dummy_encryption(sb, fc, fsopt);

	if (err)

		return err;



	if (fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS)

		ceph_set_mount_opt(fsc, ASYNC_DIROPS);
@@ -1320,7 +1400,7 @@ static int ceph_reconfigure_fc(struct fs_context *fc) 
		pr_notice("ceph: monitor addresses recorded, but not used for reconnection");

	}



	sync_filesystem(fc->root->d_sb);

	sync_filesystem(sb);

	return 0;

}

fs/ceph/super.h

+8 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/hashtable.h>



#include <linux/ceph/libceph.h>

#include "crypto.h"



/* large granularity for statfs utilization stats to facilitate

 * large volume sizes on 32-bit machines. */
@@ -99,6 +100,7 @@ struct ceph_mount_options { 
	char *server_path;    /* default NULL (means "/") */

	char *fscache_uniq;   /* default NULL */

	char *mon_addr;

	struct fscrypt_dummy_policy dummy_enc_policy;

};



/* mount state */
@@ -155,9 +157,11 @@ struct ceph_fs_client { 
#ifdef CONFIG_CEPH_FSCACHE

	struct fscache_volume *fscache;

#endif

#ifdef CONFIG_FS_ENCRYPTION

	struct fscrypt_dummy_policy fsc_dummy_enc_policy;

#endif

};





/*

 * File i/o capability.  This tracks shared state with the metadata

 * server that allows us to cache or writeback attributes or to read
@@ -1120,6 +1124,9 @@ struct ceph_acl_sec_ctx { 
#ifdef CONFIG_CEPH_FS_SECURITY_LABEL

	void *sec_ctx;

	u32 sec_ctxlen;

#endif

#ifdef CONFIG_FS_ENCRYPTION

	struct ceph_fscrypt_auth *fscrypt_auth;

#endif

	struct ceph_pagelist *pagelist;

};