Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: fix AppendDevicePath

Browse source 
The logic of the AppendDevicePath service of the
EFI_DEVICE_PATH_UTILITIES_PROTOCOL is incorrectly implemented:

* if both paths are NULL an end node has to be returned
* if both paths are not NULL the end node of the second device path has to
  be kept

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2018-04-16 07:59:06 +02:00 • committed by Alexander Graf
parent 211314c107
commit 07836345ba
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/efi_loader/efi_device_path.c
View file

@ -263,7 +263,10 @@ struct efi_device_path *efi_dp_append(const struct efi_device_path *dp1,
{ {
struct efi_device_path *ret; struct efi_device_path *ret;
if (!dp1) { if (!dp1 && !dp2) {
/* return an end node */
ret = efi_dp_dup(&END);
} else if (!dp1) {
ret = efi_dp_dup(dp2); ret = efi_dp_dup(dp2);
} else if (!dp2) { } else if (!dp2) {
ret = efi_dp_dup(dp1); ret = efi_dp_dup(dp1);
@ -275,8 +278,8 @@ struct efi_device_path *efi_dp_append(const struct efi_device_path *dp1,
if (!p) if (!p)
return NULL; return NULL;
memcpy(p, dp1, sz1); memcpy(p, dp1, sz1);
memcpy(p + sz1, dp2, sz2); /* the end node of the second device path has to be retained */
memcpy(p + sz1 + sz2, &END, sizeof(END)); memcpy(p + sz1, dp2, sz2 + sizeof(END));
ret = p; ret = p;
} }