|
@@ -98,19 +98,20 @@ efi_load_file2_initrd(struct efi_load_file_protocol *this,
|
|
struct efi_device_path *file_path, bool boot_policy,
|
|
struct efi_device_path *file_path, bool boot_policy,
|
|
efi_uintn_t *buffer_size, void *buffer)
|
|
efi_uintn_t *buffer_size, void *buffer)
|
|
{
|
|
{
|
|
- const char *filespec = CONFIG_EFI_INITRD_FILESPEC;
|
|
|
|
|
|
+ char *filespec;
|
|
efi_status_t status = EFI_NOT_FOUND;
|
|
efi_status_t status = EFI_NOT_FOUND;
|
|
loff_t file_sz = 0, read_sz = 0;
|
|
loff_t file_sz = 0, read_sz = 0;
|
|
char *dev, *part, *file;
|
|
char *dev, *part, *file;
|
|
- char *s;
|
|
|
|
|
|
+ char *pos;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
EFI_ENTRY("%p, %p, %d, %p, %p", this, file_path, boot_policy,
|
|
EFI_ENTRY("%p, %p, %d, %p, %p", this, file_path, boot_policy,
|
|
buffer_size, buffer);
|
|
buffer_size, buffer);
|
|
|
|
|
|
- s = strdup(filespec);
|
|
|
|
- if (!s)
|
|
|
|
|
|
+ filespec = strdup(CONFIG_EFI_INITRD_FILESPEC);
|
|
|
|
+ if (!filespec)
|
|
goto out;
|
|
goto out;
|
|
|
|
+ pos = filespec;
|
|
|
|
|
|
if (!this || this != &efi_lf2_protocol ||
|
|
if (!this || this != &efi_lf2_protocol ||
|
|
!buffer_size) {
|
|
!buffer_size) {
|
|
@@ -136,13 +137,13 @@ efi_load_file2_initrd(struct efi_load_file_protocol *this,
|
|
* * a device and partition identifier, e.g. "0:1"
|
|
* * a device and partition identifier, e.g. "0:1"
|
|
* * a file path on the block device, e.g. "/boot/initrd.cpio.gz"
|
|
* * a file path on the block device, e.g. "/boot/initrd.cpio.gz"
|
|
*/
|
|
*/
|
|
- dev = strsep(&s, " ");
|
|
|
|
|
|
+ dev = strsep(&pos, " ");
|
|
if (!dev)
|
|
if (!dev)
|
|
goto out;
|
|
goto out;
|
|
- part = strsep(&s, " ");
|
|
|
|
|
|
+ part = strsep(&pos, " ");
|
|
if (!part)
|
|
if (!part)
|
|
goto out;
|
|
goto out;
|
|
- file = strsep(&s, " ");
|
|
|
|
|
|
+ file = strsep(&pos, " ");
|
|
if (!file)
|
|
if (!file)
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
@@ -170,7 +171,7 @@ efi_load_file2_initrd(struct efi_load_file_protocol *this,
|
|
}
|
|
}
|
|
|
|
|
|
out:
|
|
out:
|
|
- free(s);
|
|
|
|
|
|
+ free(filespec);
|
|
return EFI_EXIT(status);
|
|
return EFI_EXIT(status);
|
|
}
|
|
}
|
|
|
|
|