Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

efi_loader: efi_dp_from_file() expect UTF-8 path

Browse source 
Properly convert UTF-8 file names to UTF-16.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-07-14 19:26:47 +02:00
parent 02b31dce93
commit 046fe7b507
1 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/efi_loader/efi_device_path.c
View file

@ -12,6 +12,7 @@
#include <mmc.h>
#include <efi_loader.h>
#include <part.h>
#include <asm-generic/unaligned.h>
/* template END node: */
static const struct efi_device_path END = {
@ -793,16 +794,36 @@ struct efi_device_path *efi_dp_part_node(struct blk_desc *desc, int part)
return buf;
}
/* convert path to an UEFI style path (i.e. DOS style backslashes and UTF-16) */
static void path_to_uefi(u16 *uefi, const char *path)
/**
* path_to_uefi() - convert UTF-8 path to an UEFI style path
*
* Convert UTF-8 path to a UEFI style path (i.e. with backslashes as path
* separators and UTF-16).
*
* @src: source buffer
* @uefi: target buffer, possibly unaligned
*/
static void path_to_uefi(void *uefi, const char *src)
{
while (*path) {
char c = *(path++);
if (c == '/')
c = '\\';
*(uefi++) = c;
u16 *pos = uefi;
/*
* efi_set_bootdev() calls this routine indirectly before the UEFI
* subsystem is initialized. So we cannot assume unaligned access to be
* enabled.
*/
allow_unaligned();
while (*src) {
s32 code = utf8_get(&src);
if (code < 0)
code = '?';
else if (code == '/')
code = '\\';
utf16_put(code, &pos);
}
*uefi = '\0';
*pos = 0;
}
/*
@ -819,7 +840,8 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
if (desc)
dpsize = dp_part_size(desc, part);
fpsize = sizeof(struct efi_device_path) + 2 * (strlen(path) + 1);
fpsize = sizeof(struct efi_device_path) +
2 * (utf8_utf16_strlen(path) + 1);
dpsize += fpsize;
start = buf = dp_alloc(dpsize + sizeof(END));