4.19-stable patches

added patches:
	efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch

diff --git a/queue-4.19/efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch b/queue-4.19/efivarfs-replace-invalid-slashes-with-exclamation-marks-in-dentries.patch
new file mode 100644 (file)
index 0000000..bb92e90
--- /dev/null
+++ b/queue-4.19/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 <misch@google.com>
+Date: Fri, 25 Sep 2020 09:45:02 +0200
+Subject: efivarfs: Replace invalid slashes with exclamation marks in dentries.
+
+From: Michael Schaller <misch@google.com>
+
+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>
+
+---
+ fs/efivarfs/super.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/fs/efivarfs/super.c
++++ b/fs/efivarfs/super.c
+@@ -145,6 +145,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-4.19/series b/queue-4.19/series
index c5e30df85e413187bb2284c45ee9ee2e2d4c0ef2..5aa647729075f03df7142a1a8463090de4d94f2c 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -3,3 +3,4 @@ scripts-setlocalversion-make-git-describe-output-more-reliable.patch
 arm64-run-arch_workaround_1-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