SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Use xstr8_to_16 for path conversion

Browse Source
This commit is contained in:
Jan Janssen
2022-11-22 16:50:42 +01:00
parent aee515bbb5
commit 7444e10611
4 changed files with 24 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/efi/boot.c
+4 -4
View File
@@ -1443,7 +1443,7 @@ static void config_entry_add_type1(
if (streq8(key, "linux")) {
free(entry->loader);
entry->type = LOADER_LINUX;
entry->loader = xstra_to_path(value);
entry->loader = xstr8_to_path(value);
entry->key = 'l';
continue;
}
@@ -1451,7 +1451,7 @@ static void config_entry_add_type1(
if (streq8(key, "efi")) {
entry->type = LOADER_EFI;
free(entry->loader);
entry->loader = xstra_to_path(value);
entry->loader = xstr8_to_path(value);
/* do not add an entry for ourselves */
if (strcaseeq16(entry->loader, loaded_image_path)) {
@@ -1472,7 +1472,7 @@ static void config_entry_add_type1(
if (streq8(key, "devicetree")) {
free(entry->devicetree);
entry->devicetree = xstra_to_path(value);
entry->devicetree = xstr8_to_path(value);
continue;
}
@@ -1481,7 +1481,7 @@ static void config_entry_add_type1(
entry->initrd,
n_initrd == 0 ? 0 : (n_initrd + 1) * sizeof(uint16_t *),
(n_initrd + 2) * sizeof(uint16_t *));
entry->initrd[n_initrd++] = xstra_to_path(value);
entry->initrd[n_initrd++] = xstr8_to_path(value);
entry->initrd[n_initrd] = NULL;
continue;
}
src/boot/efi/cpio.c
+1 -18
View File
@@ -359,24 +359,7 @@ static char16_t *get_dropin_dir(const EFI_DEVICE_PATH *file_path) {
if (device_path_to_str(file_path, &file_path_str) != EFI_SUCCESS)
return NULL;
for (char16_t *i = file_path_str, *fixed = i;; i++) {
if (*i == '\0') {
*fixed = '\0';
break;
}
/* Fix device path node separator. */
if (*i == '/')
*i = '\\';
/* Double '\' is not allowed in EFI file paths. */
if (fixed != file_path_str && fixed[-1] == '\\' && *i == '\\')
continue;
*fixed = *i;
fixed++;
}
convert_efi_path(file_path_str);
return xpool_print(u"%s.extra.d", file_path_str);
}
src/boot/efi/util.c
+17 -85
View File
@@ -244,97 +244,29 @@ void efivar_set_time_usec(const EFI_GUID *vendor, const char16_t *name, uint64_t
efivar_set(vendor, name, str, 0);
}
static int utf8_to_16(const char *stra, char16_t *c) {
char16_t unichar;
UINTN len;
void convert_efi_path(char16_t *path) {
assert(path);
assert(stra);
assert(c);
for (size_t i = 0, fixed = 0;; i++) {
/* Fix device path node separator. */
path[fixed] = (path[i] == '/') ? '\\' : path[i];
if (!(stra[0] & 0x80))
len = 1;
else if ((stra[0] & 0xe0) == 0xc0)
len = 2;
else if ((stra[0] & 0xf0) == 0xe0)
len = 3;
else if ((stra[0] & 0xf8) == 0xf0)
len = 4;
else if ((stra[0] & 0xfc) == 0xf8)
len = 5;
else if ((stra[0] & 0xfe) == 0xfc)
len = 6;
else
return -1;
/* Double '\' is not allowed in EFI file paths. */
if (fixed > 0 && path[fixed - 1] == '\\' && path[fixed] == '\\')
continue;
switch (len) {
case 1:
unichar = stra[0];
break;
case 2:
unichar = stra[0] & 0x1f;
break;
case 3:
unichar = stra[0] & 0x0f;
break;
case 4:
unichar = stra[0] & 0x07;
break;
case 5:
unichar = stra[0] & 0x03;
break;
case 6:
unichar = stra[0] & 0x01;
break;
if (path[i] == '\0')
break;
fixed++;
}
for (UINTN i = 1; i < len; i++) {
if ((stra[i] & 0xc0) != 0x80)
return -1;
unichar <<= 6;
unichar |= stra[i] & 0x3f;
}
*c = unichar;
return len;
}
char16_t *xstra_to_path(const char *stra) {
char16_t *str;
UINTN strlen;
UINTN len;
UINTN i;
assert(stra);
len = strlen8(stra);
str = xnew(char16_t, len + 2);
str[0] = '\\';
strlen = 1;
i = 0;
while (i < len) {
int utf8len;
utf8len = utf8_to_16(stra + i, str + strlen);
if (utf8len <= 0) {
/* invalid utf8 sequence, skip the garbage */
i++;
continue;
}
if (str[strlen] == '/')
str[strlen] = '\\';
if (str[strlen] == '\\' && str[strlen-1] == '\\') {
/* skip double slashes */
i += utf8len;
continue;
}
strlen++;
i += utf8len;
}
str[strlen] = '\0';
return str;
char16_t *xstr8_to_path(const char *str8) {
assert(str8);
char16_t *path = xstr8_to_16(str8);
convert_efi_path(path);
return path;
}
EFI_STATUS file_read(EFI_FILE *dir, const char16_t *name, UINTN off, UINTN size, char **ret, UINTN *ret_size) {
src/boot/efi/util.h
+2 -1
View File
@@ -137,7 +137,8 @@ EFI_STATUS efivar_get_uint32_le(const EFI_GUID *vendor, const char16_t *name, ui
EFI_STATUS efivar_get_uint64_le(const EFI_GUID *vendor, const char16_t *name, uint64_t *ret);
EFI_STATUS efivar_get_boolean_u8(const EFI_GUID *vendor, const char16_t *name, bool *ret);
char16_t *xstra_to_path(const char *stra);
void convert_efi_path(char16_t *path);
char16_t *xstr8_to_path(const char *stra);
EFI_STATUS file_read(EFI_FILE *dir, const char16_t *name, UINTN off, UINTN size, char **content, UINTN *content_size);