From 10a95535b0dcde7daa3402b92f3c8d4494781c28 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 27 Jan 2015 20:38:11 +0000 Subject: [PATCH] ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index ff29b4702f..7bcb87e1fa 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -817,6 +820,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- 2.39.5