efi_loader: Pass address to fs_read()

The fs_read() function wants to get an address rather than the
pointer to a buffer.

So let's convert the passed buffer from pointer back a the address
to make efi_loader on sandbox happier.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index e6a15bcb523e7f42beff044fbca3ceb94f9cbd8a..2107730ba5ac2c0ec70132de0c77d3eaf4af568c 100644 (file)
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -9,6 +9,7 @@
 #include <charset.h>
 #include <efi_loader.h>
 #include <malloc.h>
+#include <mapmem.h>
 #include <fs.h>
 
 /* GUID for file system information */
@@ -232,8 +233,10 @@ static efi_status_t file_read(struct file_handle *fh, u64 *buffer_size,
                void *buffer)
 {
        loff_t actread;
+       /* fs_read expects buffer address, not pointer */
+       uintptr_t buffer_addr = (uintptr_t)map_to_sysmem(buffer);
 
-       if (fs_read(fh->path, (ulong)buffer, fh->offset,
+       if (fs_read(fh->path, buffer_addr, fh->offset,
                    *buffer_size, &actread))
                return EFI_DEVICE_ERROR;