Skip to contentSkip to conversation

efivarfs: Replace invalid slashes with exclamation marks in dentries.

PATCH Superseded Michael Schaller 2 participants 3 messages Sep 18, 2020 – Sep 25, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efivarfs: Replace invalid slashes with exclamation marks in dentries.

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/.

---
 fs/efivarfs/super.c | 3 +++
 1 file changed, 3 insertions(+)
fs/efivarfs/super.c +3 -0
index 28bb5689333a..15880a68faad 100644
@@ -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)
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
maintainer
#1 lore raw
Quoted 9 lines · Michael Schaller

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/.

Thanks Michael

Can you resend this with a signed-off-by line please?

Quoted 21 lines
---
 fs/efivarfs/super.c | 3 +++
 1 file changed, 3 insertions(+)
fs/efivarfs/super.c +3 -1
index 28bb5689333a..15880a68faad 100644
@@ -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)
--

2.28.0.681.g6f77f65b4e-goog

#2 lore raw
Quoted 8 lines · Ard Biesheuvel
Quoted 6 lines · Michael Schaller

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/.

Quoted 8 lines
Quoted 3 lines

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/.

Thanks Michael

Can you resend this with a signed-off-by line please?

I've sent a v2 patch in a new mail thread.

Quoted 21 lines
Quoted 21 lines
---
 fs/efivarfs/super.c | 3 +++
 1 file changed, 3 insertions(+)
fs/efivarfs/super.c +3 -1
index 28bb5689333a..15880a68faad 100644
@@ -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)
--

2.28.0.681.g6f77f65b4e-goog