You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
2.1 KiB
56 lines
2.1 KiB
From 035634047d10c678cbb8801c4263747bdaf4e5b1 Mon Sep 17 00:00:00 2001
|
|
From: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
Date: Fri, 14 Jun 2013 16:43:16 +0100
|
|
Subject: [PATCH 04/23] libelf: add `struct elf_binary*' parameter to elf_load_image
|
|
|
|
The meat of this function is going to need a copy of the elf pointer,
|
|
in forthcoming patches.
|
|
|
|
No functional change in this patch.
|
|
|
|
This is part of the fix to a security issue, XSA-55.
|
|
|
|
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
|
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
---
|
|
xen/common/libelf/libelf-loader.c | 8 +++++---
|
|
1 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c
|
|
index ab58b8b..0559d88 100644
|
|
--- a/xen/common/libelf/libelf-loader.c
|
|
+++ b/xen/common/libelf/libelf-loader.c
|
|
@@ -108,7 +108,8 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback *log_callback,
|
|
elf->verbose = verbose;
|
|
}
|
|
|
|
-static int elf_load_image(void *dst, const void *src, uint64_t filesz, uint64_t memsz)
|
|
+static int elf_load_image(struct elf_binary *elf,
|
|
+ void *dst, const void *src, uint64_t filesz, uint64_t memsz)
|
|
{
|
|
memcpy(dst, src, filesz);
|
|
memset(dst + filesz, 0, memsz - filesz);
|
|
@@ -122,7 +123,8 @@ void elf_set_verbose(struct elf_binary *elf)
|
|
elf->verbose = 1;
|
|
}
|
|
|
|
-static int elf_load_image(void *dst, const void *src, uint64_t filesz, uint64_t memsz)
|
|
+static int elf_load_image(struct elf_binary *elf,
|
|
+ void *dst, const void *src, uint64_t filesz, uint64_t memsz)
|
|
{
|
|
int rc;
|
|
if ( filesz > ULONG_MAX || memsz > ULONG_MAX )
|
|
@@ -279,7 +281,7 @@ int elf_load_binary(struct elf_binary *elf)
|
|
dest = elf_get_ptr(elf, paddr);
|
|
elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n",
|
|
__func__, i, dest, dest + filesz);
|
|
- if ( elf_load_image(dest, elf->image + offset, filesz, memsz) != 0 )
|
|
+ if ( elf_load_image(elf, dest, elf->image + offset, filesz, memsz) != 0 )
|
|
return -1;
|
|
}
|
|
|
|
--
|
|
1.7.2.5
|
|
|