picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix parsing of features in detect_vm_xen_dom0 (#7890) 

Use sscanf instead of the built-in safe_atolu because the scanned string
lacks the leading "0x", it is generated with snprintf(b, "%08x", val).
As a result strtoull handles it as octal, and parsing fails.

The initial submission already used sscanf, then parsing was replaced by
safe_atolu without retesting the updated PR.

Fixes 575e6588d ("virt: use XENFEAT_dom0 to detect the hardware domain
(#6442, #6662) (#7581)")
This commit is contained in:
Olaf Hering 2018-01-16 10:24:37 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 4579e8ef31
commit 13e0f9fe83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/virt.c
View File

@ -222,8 +222,8 @@ static int detect_vm_xen_dom0(void) {
if (r == 0) {
unsigned long features;
r = safe_atolu(domcap, &features);
if (r == 0) {
r = sscanf(domcap, "%lx", &features);
if (r == 1) {
r = !!(features & (1U << XENFEAT_dom0));
log_debug("Virtualization XEN, found %s with value %08lx, "
"XENFEAT_dom0 (indicating the 'hardware domain') is%s set.",