summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Schaller <misch@google.com>2020-09-25 09:45:02 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-10 10:23:50 +0100
commite3f04230b97b5884247d8d12aa7d3b3c9ed45c58 (patch)
treefce78f5484ac650ee362482bb2679ed799e79e9c
parent3657ef47741d74c7aa38a1c1119c14935325eb41 (diff)
downloadlinux-stable-e3f04230b97b5884247d8d12aa7d3b3c9ed45c58.tar.gz
linux-stable-e3f04230b97b5884247d8d12aa7d3b3c9ed45c58.tar.bz2
linux-stable-e3f04230b97b5884247d8d12aa7d3b3c9ed45c58.zip
efivarfs: Replace invalid slashes with exclamation marks in dentries.
commit 336af6a4686d885a067ecea8c3c3dd129ba4fc75 upstream. Without this patch efivarfs_alloc_dentry creates dentries with slashes in their name if the respective EFI variable has slashes in its name. This in turn causes EIO on getdents64, which prevents a complete directory listing of /sys/firmware/efi/efivars/. This patch replaces the invalid shlashes with exclamation marks like kobject_set_name_vargs does for /sys/firmware/efi/vars/ to have consistently named dentries under /sys/firmware/efi/vars/ and /sys/firmware/efi/efivars/. Signed-off-by: Michael Schaller <misch@google.com> Link: https://lore.kernel.org/r/20200925074502.150448-1-misch@google.com Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: dann frazier <dann.frazier@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/efivarfs/super.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index d7a7c53803c1..b1e6acec5304 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -146,6 +146,9 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
name[len + EFI_VARIABLE_GUID_LEN+1] = '\0';
+ /* replace invalid slashes like kobject_set_name_vargs does for /sys/firmware/efi/vars. */
+ strreplace(name, '/', '!');
+
inode = efivarfs_get_inode(sb, d_inode(root), S_IFREG | 0644, 0,
is_removable);
if (!inode)