| From 496ec2d0852a02d2e631771b5c439130b9c7dce7 Mon Sep 17 00:00:00 2001 |
| From: Yichong Chen <chenyichong@uniontech.com> |
| Date: Thu, 2 Jul 2026 13:29:58 +0800 |
| Subject: ecryptfs: show filename encryption options |
| |
| From: Yichong Chen <chenyichong@uniontech.com> |
| |
| commit 496ec2d0852a02d2e631771b5c439130b9c7dce7 upstream. |
| |
| ecryptfs_show_options() prints most user-visible mount options but |
| omits the filename encryption cipher and key size. |
| |
| Print ecryptfs_fn_cipher and ecryptfs_fn_key_bytes when filename |
| encryption is enabled so that the displayed mount options reflect the |
| active filename encryption settings. |
| |
| Fixes: 87c94c4df014 ("eCryptfs: Filename Encryption: mount option") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Yichong Chen <chenyichong@uniontech.com> |
| Signed-off-by: Tyler Hicks <code@tyhicks.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/ecryptfs/super.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- a/fs/ecryptfs/super.c |
| +++ b/fs/ecryptfs/super.c |
| @@ -153,6 +153,13 @@ static int ecryptfs_show_options(struct |
| if (mount_crypt_stat->global_default_cipher_key_size) |
| seq_printf(m, ",ecryptfs_key_bytes=%zd", |
| mount_crypt_stat->global_default_cipher_key_size); |
| + if (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES) { |
| + seq_printf(m, ",ecryptfs_fn_cipher=%s", |
| + mount_crypt_stat->global_default_fn_cipher_name); |
| + if (mount_crypt_stat->global_default_fn_cipher_key_bytes) |
| + seq_printf(m, ",ecryptfs_fn_key_bytes=%zd", |
| + mount_crypt_stat->global_default_fn_cipher_key_bytes); |
| + } |
| if (mount_crypt_stat->flags & ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED) |
| seq_printf(m, ",ecryptfs_passthrough"); |
| if (mount_crypt_stat->flags & ECRYPTFS_XATTR_METADATA_ENABLED) |
