diff options
| author | Ian Jackson <ian.jackson@eu.citrix.com> | 2013-06-14 16:43:16 +0100 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-06-14 16:43:16 +0100 |
| commit | 682a04488e7b3bd6c3448ab60599566eb7c6177a (patch) | |
| tree | bdd19e6cc65a5b5f043b5e3850f0b3a270a4d864 | |
| parent | 83ec905922b496e1a5756e3a88405eb6c2c6ba88 (diff) | |
| download | xen-682a04488e7b3bd6c3448ab60599566eb7c6177a.tar.gz xen-682a04488e7b3bd6c3448ab60599566eb7c6177a.tar.bz2 xen-682a04488e7b3bd6c3448ab60599566eb7c6177a.zip | |
libelf: move include of <asm/guest_access.h> to top of file
libelf-loader.c #includes <asm/guest_access.h>, when being compiled
for Xen. Currently it does this in the middle of the file.
Move this #include to the top of the file, before libelf-private.h.
This is necessary because in forthcoming patches we will introduce
private #defines of memcpy etc. which would interfere with definitions
in headers #included from guest_access.h.
No semantic or 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>
| -rw-r--r-- | xen/common/libelf/libelf-loader.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c index 0559d883f0..ec0706ba22 100644 --- a/xen/common/libelf/libelf-loader.c +++ b/xen/common/libelf/libelf-loader.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef __XEN__ +#include <asm/guest_access.h> +#endif + #include "libelf-private.h" /* ------------------------------------------------------------------------ */ @@ -116,7 +120,6 @@ static int elf_load_image(struct elf_binary *elf, return 0; } #else -#include <asm/guest_access.h> void elf_set_verbose(struct elf_binary *elf) { |