aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-09-20 10:55:39 -0400
committerMatt Fleming <matt.fleming@intel.com>2014-04-17 07:29:25 -0400
commitc625d1c203941fad755eb4eb729db1f65d6e9836 (patch)
tree2b1cf021ceb69963092ec5db8fbb83c356b81f75 /arch/x86
parent9bb40191e88d23563fd0467ac195debf5f6daaf9 (diff)
efi: x86: Handle arbitrary Unicode characters
Instead of truncating UTF-16 assuming all characters is ASCII, properly convert it to UTF-8. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> [ Bug and style fixes. ] Signed-off-by: Roy Franz <roy.franz@linaro.org> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/boot/compressed/eboot.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 4703a6c4b8e3..0331d765c2bb 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -1087,8 +1087,7 @@ struct boot_params *make_boot_params(struct efi_config *c)
1087 hdr->type_of_loader = 0x21; 1087 hdr->type_of_loader = 0x21;
1088 1088
1089 /* Convert unicode cmdline to ascii */ 1089 /* Convert unicode cmdline to ascii */
1090 cmdline_ptr = efi_convert_cmdline_to_ascii(sys_table, image, 1090 cmdline_ptr = efi_convert_cmdline(sys_table, image, &options_size);
1091 &options_size);
1092 if (!cmdline_ptr) 1091 if (!cmdline_ptr)
1093 goto fail; 1092 goto fail;
1094 hdr->cmd_line_ptr = (unsigned long)cmdline_ptr; 1093 hdr->cmd_line_ptr = (unsigned long)cmdline_ptr;