[PATCH] ceph: support legacy v1 encryption policy keysetup

Luís Henriques posted 1 patch 4 years, 2 months ago
fs/ceph/crypto.c | 1 +
1 file changed, 1 insertion(+)
[PATCH] ceph: support legacy v1 encryption policy keysetup
Posted by Luís Henriques 4 years, 2 months ago
fstests make use of legacy keysetup where the key description uses a
filesystem-specific prefix.  Add this ceph-specific prefix to the
fscrypt_operations data structure.

Signed-off-by: Luís Henriques <lhenriques@suse.de>
---
 fs/ceph/crypto.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
index c2e28ae54323..2a8f95885e7d 100644
--- a/fs/ceph/crypto.c
+++ b/fs/ceph/crypto.c
@@ -77,6 +77,7 @@ static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)
 }
 
 static struct fscrypt_operations ceph_fscrypt_ops = {
+	.key_prefix		= "ceph:",
 	.get_context		= ceph_crypt_get_context,
 	.set_context		= ceph_crypt_set_context,
 	.get_dummy_policy	= ceph_get_dummy_policy,
Re: [PATCH] ceph: support legacy v1 encryption policy keysetup
Posted by Jeff Layton 4 years, 2 months ago
On Fri, 2022-03-25 at 16:49 +0000, Luís Henriques wrote:
> fstests make use of legacy keysetup where the key description uses a
> filesystem-specific prefix.  Add this ceph-specific prefix to the
> fscrypt_operations data structure.
> 
> Signed-off-by: Luís Henriques <lhenriques@suse.de>
> ---
>  fs/ceph/crypto.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
> index c2e28ae54323..2a8f95885e7d 100644
> --- a/fs/ceph/crypto.c
> +++ b/fs/ceph/crypto.c
> @@ -77,6 +77,7 @@ static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)
>  }
>  
>  static struct fscrypt_operations ceph_fscrypt_ops = {
> +	.key_prefix		= "ceph:",
>  	.get_context		= ceph_crypt_get_context,
>  	.set_context		= ceph_crypt_set_context,
>  	.get_dummy_policy	= ceph_get_dummy_policy,


Good catch, thanks! Merged into wip-fscrypt.
-- 
Jeff Layton <jlayton@kernel.org>