aboutsummaryrefslogtreecommitdiffstats
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-01 12:45:37 +0100
commitc328793e21fb5ff72775476fdf184931a2671e56 (patch)
tree30b3956b5c9efc46c60068401c83a6780d3f9c04
parentx86/copy_mc: Introduce copy_mc_enhanced_fast_string() (diff)
downloadlinux-stable-c328793e21fb5ff72775476fdf184931a2671e56.tar.xz
linux-stable-c328793e21fb5ff72775476fdf184931a2671e56.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 28bb5689333a..15880a68faad 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -141,6 +141,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)