diff options
author | Ian Jackson <ian.jackson@eu.citrix.com> | 2013-06-14 16:39:36 +0100 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-06-14 16:39:36 +0100 |
commit | c84481fbc7de7d15ff7476b3b9cd2713f81feaa3 (patch) | |
tree | 6f44535f73cdc2984bbcbc895558a02542d232c6 /tools/libxc/xc_hvm_build_x86.c | |
parent | 943de71cf07d9d04ccb215bd46153b04930e9f25 (diff) | |
download | xen-c84481fbc7de7d15ff7476b3b9cd2713f81feaa3.tar.gz xen-c84481fbc7de7d15ff7476b3b9cd2713f81feaa3.tar.bz2 xen-c84481fbc7de7d15ff7476b3b9cd2713f81feaa3.zip |
libelf: Make all callers call elf_check_broken
This arranges that if the new pointer reference error checking
tripped, we actually get a message about it. In this patch these
messages do not change the actual return values from the various
functions: so pointer reference errors do not prevent loading. This
is for fear that some existing kernels might cause the code to make
these wild references, which would then break, which is not a good
thing in a security patch.
In xen/arch/x86/domain_build.c we have to introduce an "out" label and
change all of the "return rc" beyond the relevant point into "goto
out".
This is part of the fix to a security issue, XSA-55.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Reviewed-by: George Dunlap <george.dunlap@eu.citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
v5: Fix two whitespace errors.
v3.1:
Add error check to xc_dom_parse_elf_kernel.
Move check in xc_hvm_build_x86.c:setup_guest to right place.
v2 was Acked-by: Ian Campbell <ian.campbell@citrix.com>
v2 was Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
v2: Style fixes.
Diffstat (limited to 'tools/libxc/xc_hvm_build_x86.c')
-rw-r--r-- | tools/libxc/xc_hvm_build_x86.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index eff55a48ac..8bb0178dc5 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -524,6 +524,9 @@ static int setup_guest(xc_interface *xch, error_out: rc = -1; out: + if ( elf_check_broken(&elf) ) + ERROR("HVM ELF broken: %s", elf_check_broken(&elf)); + /* ensure no unclaimed pages are left unused */ xc_domain_claim_pages(xch, dom, 0 /* cancels the claim */); |