From 3ebe9a1a826e8d569bef6045777cc01a5699933d Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 3 Nov 2016 16:41:57 +0000 Subject: [PATCH] libxl: disallow enabling PoD and ALTP2M at the same time That combination would cause Xen to crash. Note that although this is a security issue, is not XSA-worthy because ALTP2M is experimental. Signed-off-by: Wei Liu Acked-by: Ian Jackson Reviewed-by: Kevin Tian Release-acked-by: Wei Liu --- tools/libxl/libxl_create.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index abd2272e1b..7c1695a1fd 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -915,6 +915,14 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } + if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM && + libxl_defbool_val(d_config->b_info.u.hvm.altp2m) && + pod_enabled) { + ret = ERROR_INVAL; + LOG(ERROR, "Cannot enable PoD and ALTP2M at the same time"); + goto error_out; + } + ret = libxl__domain_make(gc, d_config, &domid, &state->config); if (ret) { LOG(ERROR, "cannot make domain: %d", ret); -- 2.30.2