tools/libxl: Only access legacy altp2m on HVM

Only access the HVM union b_info->u.hvm on HVM guests.  The union
access is not guarded, so this reads and sets the default even on
non-HVM guests.  Usually this doesn't matter as PV and PVH unions are
smaller and zero-initialized, but the zero default will be re-written as
a -1 boolean.  Generally, it could incorrectly set b_info->altp2m
through aliased data.

Fixes: 0291089f6e ("xen: enable altp2m at create domain domctl")
Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
Acked-by: Anthony PERARD <anthony.perard@vates.tech>
This commit is contained in:
Jason Andryuk authored and Anthony PERARD committed 2025-06-02 10:31:21 +02:00
1 parent 96a587a057
commit 01dfd25509
1 file changed
+13 -11
+13 -11
View File
@@ -814,17 +814,19 @@ int libxl__arch_domain_build_info_setdefault(libxl__gc *gc,
libxl_defbool_setdefault(&b_info->acpi, true);
libxl_defbool_setdefault(&b_info->arch_x86.msr_relaxed, false);
/*
* The config parameter "altp2m" replaces the parameter "altp2mhvm".
* For legacy reasons, both parameters are accepted on x86 HVM guests.
*
* If the legacy field info->u.hvm.altp2m is set, activate altp2m.
* Otherwise set altp2m based on the field info->altp2m.
*/
libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false);
if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED &&
libxl_defbool_val(b_info->u.hvm.altp2m))
b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m);
if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
/*
* The config parameter "altp2m" replaces the parameter "altp2mhvm".
* For legacy reasons, both parameters are accepted on x86 HVM guests.
*
* If the legacy field info->u.hvm.altp2m is set, activate altp2m.
* Otherwise set altp2m based on the field info->altp2m.
*/
libxl_defbool_setdefault(&b_info->u.hvm.altp2m, false);
if (b_info->altp2m == LIBXL_ALTP2M_MODE_DISABLED &&
libxl_defbool_val(b_info->u.hvm.altp2m))
b_info->altp2m = libxl_defbool_val(b_info->u.hvm.altp2m);
}
return 0;
}
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.