From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03AE03DB310; Fri, 4 Sep 2026 05:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500843; cv=none; b=tq2q99kuGbYRQZu/IJFpMhN+sSO5mdgs7tFuOFzb3TjBIxP19+ouctUSZf0OrhBv9OVoXs4l45k5EsamjPkiF14Mj1FD943Y3uK7maW3B4ONq88yY8/8Cz737Dtydd6lQgOp5WwqKBtZGUBW1oBkXcxcaRTOBvX3JRvyWLK8v4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500843; c=relaxed/simple; bh=T175X4gC5mFJy9Y6dqV3rHpunGCEHZAxyW2DOoxus0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DIkzCR0FfKFSYJr6w4azwKnkNS2DDvGQXEmMczlUrlGrloCeVPsaX5JW9f1wPR3UuNObJMWfW9JH8IddsfrvuWdHXnIXsaNAEQ8XMKl32Xjvh6XnGuafc2JC2zzt4/u4vWTGvTNVev0njwPnbiupGFV+XzU4jcqDIxQD7rkK8UE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=unnPSkBe; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="unnPSkBe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CC8C1F00A3D; Fri, 4 Sep 2026 05:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788500841; bh=vkpl2QnN9Aaex4yMWbYWHiPRTigoH441I00g8Ju0zlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=unnPSkBe08WHfVeK8cSlkey32HdviEfLqRl+4rAUbG0nPiBlpVLZCALi/5tXIZcCp XXPz64PC6qLTWD+PwaPYimmO4pyZSPcpaILoHwY6USaVZ+xhGjLf+M7C36lZ9hfHPa gPmjbChyxwXstQ+o9sU2vdVb3SB5zi+ChmsIFPi0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yichong Chen , Tyler Hicks Subject: [PATCH 6.18 198/552] ecryptfs: show filename encryption options Date: Fri, 4 Sep 2026 06:55:55 +0200 Message-ID: <20260904045753.609800450@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yichong Chen 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: Signed-off-by: Yichong Chen Signed-off-by: Tyler Hicks Signed-off-by: Greg Kroah-Hartman --- 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)