| Message ID | 20201104150249.1304567-2-dann.frazier@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix MAAS deployments on EFI systems that contain EFI variables w/ slashes | expand |
On 04.11.20 16:02, dann frazier wrote: > From: Michael Schaller <misch@google.com> > > BugLink: https:/bugs.launchpad.net/bugs/1899993 > > 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> > (cherry picked from commit 336af6a4686d885a067ecea8c3c3dd129ba4fc75) > Signed-off-by: dann frazier <dann.frazier@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > fs/efivarfs/super.c | 3 +++ > 1 file changed, 3 insertions(+) > > 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) >
On 04.11.20 16:02, dann frazier wrote: > From: Michael Schaller <misch@google.com> > > BugLink: https:/bugs.launchpad.net/bugs/1899993 > > 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> > (cherry picked from commit 336af6a4686d885a067ecea8c3c3dd129ba4fc75) > Signed-off-by: dann frazier <dann.frazier@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- Could you please add the reasoning in standard SRU template form to the bug report. Otherwise appears ok. -Stefan > fs/efivarfs/super.c | 3 +++ > 1 file changed, 3 insertions(+) > > 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) >
On Fri, Nov 6, 2020 at 3:30 AM Stefan Bader <stefan.bader@canonical.com> wrote: > > On 04.11.20 16:02, dann frazier wrote: > > From: Michael Schaller <misch@google.com> > > > > BugLink: https:/bugs.launchpad.net/bugs/1899993 > > > > 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> > > (cherry picked from commit 336af6a4686d885a067ecea8c3c3dd129ba4fc75) > > Signed-off-by: dann frazier <dann.frazier@canonical.com> > Acked-by: Stefan Bader <stefan.bader@canonical.com> > > --- > > Could you please add the reasoning in standard SRU template form to the bug > report. Otherwise appears ok. Now done, Cheers! -dann
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)