diff mbox series

ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION

Message ID 20231123030838.46158-1-ebiggers@kernel.org
State New
Headers show
Series ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION | expand

Commit Message

Eric Biggers Nov. 23, 2023, 3:08 a.m. UTC
From: Eric Biggers <ebiggers@google.com>

The kconfig options for filesystems that support FS_ENCRYPTION are
supposed to select FS_ENCRYPTION_ALGS.  This is needed to ensure that
required crypto algorithms get enabled as loadable modules or builtin as
is appropriate for the set of enabled filesystems.  Do this for CEPH_FS
so that there aren't any missing algorithms if someone happens to have
CEPH_FS as their only enabled filesystem that supports encryption.

Fixes: f061feda6c54 ("ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/ceph/Kconfig | 1 +
 1 file changed, 1 insertion(+)


base-commit: 9b6de136b5f0158c60844f85286a593cb70fb364

Comments

Xiubo Li Nov. 23, 2023, 4:32 a.m. UTC | #1
On 11/23/23 11:08, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> The kconfig options for filesystems that support FS_ENCRYPTION are
> supposed to select FS_ENCRYPTION_ALGS.  This is needed to ensure that
> required crypto algorithms get enabled as loadable modules or builtin as
> is appropriate for the set of enabled filesystems.  Do this for CEPH_FS
> so that there aren't any missing algorithms if someone happens to have
> CEPH_FS as their only enabled filesystem that supports encryption.
>
> Fixes: f061feda6c54 ("ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr")
> Cc: stable@vger.kernel.org
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>   fs/ceph/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig
> index 94df854147d35..7249d70e1a43f 100644
> --- a/fs/ceph/Kconfig
> +++ b/fs/ceph/Kconfig
> @@ -1,19 +1,20 @@
>   # SPDX-License-Identifier: GPL-2.0-only
>   config CEPH_FS
>   	tristate "Ceph distributed file system"
>   	depends on INET
>   	select CEPH_LIB
>   	select LIBCRC32C
>   	select CRYPTO_AES
>   	select CRYPTO
>   	select NETFS_SUPPORT
> +	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
>   	default n
>   	help
>   	  Choose Y or M here to include support for mounting the
>   	  experimental Ceph distributed file system.  Ceph is an extremely
>   	  scalable file system designed to provide high performance,
>   	  reliable access to petabytes of storage.
>   
>   	  More information at https://ceph.io/.
>   
>   	  If unsure, say N.
>
> base-commit: 9b6de136b5f0158c60844f85286a593cb70fb364

Thanks Eric. This looks good to me.

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Ilya Dryomov Nov. 23, 2023, 8:46 p.m. UTC | #2
On Thu, Nov 23, 2023 at 5:32 AM Xiubo Li <xiubli@redhat.com> wrote:
>
>
> On 11/23/23 11:08, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> >
> > The kconfig options for filesystems that support FS_ENCRYPTION are
> > supposed to select FS_ENCRYPTION_ALGS.  This is needed to ensure that
> > required crypto algorithms get enabled as loadable modules or builtin as
> > is appropriate for the set of enabled filesystems.  Do this for CEPH_FS
> > so that there aren't any missing algorithms if someone happens to have
> > CEPH_FS as their only enabled filesystem that supports encryption.
> >
> > Fixes: f061feda6c54 ("ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> >   fs/ceph/Kconfig | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig
> > index 94df854147d35..7249d70e1a43f 100644
> > --- a/fs/ceph/Kconfig
> > +++ b/fs/ceph/Kconfig
> > @@ -1,19 +1,20 @@
> >   # SPDX-License-Identifier: GPL-2.0-only
> >   config CEPH_FS
> >       tristate "Ceph distributed file system"
> >       depends on INET
> >       select CEPH_LIB
> >       select LIBCRC32C
> >       select CRYPTO_AES
> >       select CRYPTO
> >       select NETFS_SUPPORT
> > +     select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
> >       default n
> >       help
> >         Choose Y or M here to include support for mounting the
> >         experimental Ceph distributed file system.  Ceph is an extremely
> >         scalable file system designed to provide high performance,
> >         reliable access to petabytes of storage.
> >
> >         More information at https://ceph.io/.
> >
> >         If unsure, say N.
> >
> > base-commit: 9b6de136b5f0158c60844f85286a593cb70fb364
>
> Thanks Eric. This looks good to me.
>
> Reviewed-by: Xiubo Li <xiubli@redhat.com>

Applied.

Thanks,

                Ilya
diff mbox series

Patch

diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig
index 94df854147d35..7249d70e1a43f 100644
--- a/fs/ceph/Kconfig
+++ b/fs/ceph/Kconfig
@@ -1,19 +1,20 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 config CEPH_FS
 	tristate "Ceph distributed file system"
 	depends on INET
 	select CEPH_LIB
 	select LIBCRC32C
 	select CRYPTO_AES
 	select CRYPTO
 	select NETFS_SUPPORT
+	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
 	default n
 	help
 	  Choose Y or M here to include support for mounting the
 	  experimental Ceph distributed file system.  Ceph is an extremely
 	  scalable file system designed to provide high performance,
 	  reliable access to petabytes of storage.
 
 	  More information at https://ceph.io/.
 
 	  If unsure, say N.