From eaba3146c2029b6fd694aff67ae9cae063e317d4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 29 Oct 2020 20:31:09 +0100 Subject: [PATCH] 5.4-stable patches added patches: efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch --- ...s-with-exclamation-marks-in-dentries.patch | 40 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-5.4/efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch diff --git a/queue-5.4/efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch b/queue-5.4/efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch new file mode 100644 index 00000000000..178639ccc53 --- /dev/null +++ b/queue-5.4/efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch @@ -0,0 +1,40 @@ +From 336af6a4686d885a067ecea8c3c3dd129ba4fc75 Mon Sep 17 00:00:00 2001 +From: Michael Schaller +Date: Fri, 25 Sep 2020 09:45:02 +0200 +Subject: efivarfs: Replace invalid slashes with exclamation marks in dentries. + +From: Michael Schaller + +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 +Link: https://lore.kernel.org/r/20200925074502.150448-1-misch@google.com +Signed-off-by: Ard Biesheuvel +Signed-off-by: dann frazier +Signed-off-by: Greg Kroah-Hartman + +--- + fs/efivarfs/super.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/fs/efivarfs/super.c ++++ b/fs/efivarfs/super.c +@@ -141,6 +141,9 @@ static int efivarfs_callback(efi_char16_ + + 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) diff --git a/queue-5.4/series b/queue-5.4/series index 9387f0579d9..57e396f5f62 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -6,3 +6,4 @@ arm64-run-arch_workaround_1-enabling-code-on-all-cpus.patch arm64-run-arch_workaround_2-enabling-code-on-all-cpus.patch arm64-link-with-z-norelro-regardless-of-config_relocatable.patch x86-pci-fix-intel_mid_pci.c-build-error-when-acpi-is-not-enabled.patch +efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch -- 2.47.3