efi: Use ucs2_as_utf8 in efivarfs instead of open coding a bad version

Translate EFI's UCS-2 variable names to UTF-8 instead of just assuming
all variable names fit in ASCII.

Signed-off-by: Peter Jones <pjones@redhat.com>
Acked-by: Matthew Garrett <mjg59@coreos.com>
Tested-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index b8a564f29107..8651ac28ec0d 100644
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -118,7 +118,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
         struct dentry *dentry, *root = sb->s_root;
         unsigned long size = 0;
         char *name;
-        int len, i;
+        int len;
         int err = -ENOMEM;
 
         entry = kzalloc(sizeof(*entry), GFP_KERNEL);
@@ -128,15 +128,14 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
         memcpy(entry->var.VariableName, name16, name_size);
         memcpy(&(entry->var.VendorGuid), &vendor, sizeof(efi_guid_t));
 
-        len = ucs2_strlen(entry->var.VariableName);
+        len = ucs2_utf8size(entry->var.VariableName);
 
         /* name, plus '-', plus GUID, plus NUL*/
         name = kmalloc(len + 1 + EFI_VARIABLE_GUID_LEN + 1, GFP_KERNEL);
         if (!name)
                 goto fail;
 
-        for (i = 0; i < len; i++)
-                name[i] = entry->var.VariableName[i] & 0xFF;
+        ucs2_as_utf8(name, entry->var.VariableName, len);
 
         name[len] = '-';