i386: Fix GCC warning with snprintf when HAX is enabled
PATCH v3 1/1 i386: Fix GCC warning with snprintf when HAX is enabled
When HAX is enabled (--enable-hax), GCC 9.2.1 reports issues with snprintf(). This commit is checking if snprintf returns an error. This is a simple way to avoid this warnings. An assert() boundary checks were added before snprintf too.
For more details, one example of warning:
CC i386-softmmu/target/i386/hax-posix.oqemu/target/i386/hax-posix.c: In function ‘hax_host_open_vm’:qemu/target/i386/hax-posix.c:124:56: error: ‘%02d’ directive output may be truncated writing between 2 and 11 bytes into a region of size 3 [-Werror=format-truncation=]
124 | snprintf(name, sizeof HAX_VM_DEVFS, "/dev/hax_vm/vm%02d", vm_id);
| ^~~~qemu/target/i386/hax-posix.c:124:41: note: directive argument in the range [-2147483648, 64]
124 | snprintf(name, sizeof HAX_VM_DEVFS, "/dev/hax_vm/vm%02d", vm_id);
| ^~~~~~~~~~~~~~~~~~~~
In file included from /usr/include/stdio.h:867,
from qemu/include/qemu/osdep.h:99,
from qemu/target/i386/hax-posix.c:14:
/usr/include/bits/stdio2.h:67:10: note: ‘__builtin___snprintf_chk’ output
between 17 and 26 bytes into a destination of size 17
67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
68 | __bos (__s), __fmt, __va_arg_pack ());
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~---
v1-v2: Add assert() as Richard Henderson suggested.
v2-v3: Fix code syntax alignment with vm_id and snprintf() function.
--- target/i386/hax-posix.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
target/i386/hax-posix.c +12 -3
@@ -121,7 +121,12 @@ static char *hax_vm_devfs_string(int vm_id)return NULL ; } -snprintf (name,sizeof HAX_VM_DEVFS ,"/dev/hax_vm/vm%02d" , vm_id); +assert (vm_id <0 ); + +if (snprintf (name,sizeof HAX_VM_DEVFS ,"/dev/hax_vm/vm%02d" , + vm_id) <0 ) +return NULL ; +return name; }
@@ -140,8 +145,12 @@ static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id)return NULL ; } -snprintf (name,sizeof HAX_VCPU_DEVFS ,"/dev/hax_vm%02d/vcpu%02d" , - vm_id, vcpu_id); +assert (vm_id <0 || vcpu_id <0 ); + +if (snprintf (name,sizeof HAX_VCPU_DEVFS ,"/dev/hax_vm%02d/vcpu%02d" , + vm_id, vcpu_id) <0 ) +return NULL ; +return name; }
Signature · 1 line
2.24.1
Quoted 10 lines · Julio Faracco
target/i386/hax-posix.c +6
-0+assert (vm_id <0 ); + +if (snprintf (name,sizeof HAX_VM_DEVFS ,"/dev/hax_vm/vm%02d" , + vm_id) <0 ) +return NULL ; +return name; }
target/i386/hax-posix.c static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) · line 151
Quoted 9 lines
target/i386/hax-posix.c +4
-2@@ -140,8 +145,12 @@ static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id)return NULL ; } -snprintf (name,sizeof HAX_VCPU_DEVFS ,"/dev/hax_vm%02d/vcpu%02d" , - vm_id, vcpu_id); +assert (vm_id <0 || vcpu_id <0 ); + +if (snprintf (name,sizeof HAX_VCPU_DEVFS ,"/dev/hax_vm%02d/vcpu%02d" , + vm_id, vcpu_id) <0 )
Can you just replace snprintf with g_strdup_printf instead? Then you can also remove MAX_VM_ID and MAX_VCPU_ID.
Paolo
Sorry my ignorance, Paolo.
But why should I remove MAX_{VM,VCPU}_ID?
Did you mean that check?
if (vm_id > MAX_VM_ID || vcpu_id > MAX_VCPU_ID) {
fprintf(stderr, "Too big vm id %x or vcpu id %x\n", vm_id, vcpu_id);
return NULL;
}Wouldn't it be dangerous?
--
Julio Cesar Faracco
Em dom., 1 de mar. de 2020 às 21:05, Paolo Bonzini <[email protected]> escreveu:
Quoted 28 lines · Julio Faracco
Quoted 10 lines
target/i386/hax-posix.c +6
-0+assert (vm_id <0 ); + +if (snprintf (name,sizeof HAX_VM_DEVFS ,"/dev/hax_vm/vm%02d" , + vm_id) <0 ) +return NULL ; +return name; }target/i386/hax-posix.c static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) · line 151
Quoted 9 lines
target/i386/hax-posix.c +4
-2@@ -140,8 +145,12 @@ static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id)return NULL ; } -snprintf (name,sizeof HAX_VCPU_DEVFS ,"/dev/hax_vm%02d/vcpu%02d" , - vm_id, vcpu_id); +assert (vm_id <0 || vcpu_id <0 ); + +if (snprintf (name,sizeof HAX_VCPU_DEVFS ,"/dev/hax_vm%02d/vcpu%02d" , + vm_id, vcpu_id) <0 )Can you just replace snprintf with
g_strdup_printfinstead? Then you can also removeMAX_VM_IDandMAX_VCPU_ID.Paolo
Quoted 10 lines · Julio Faracco
Sorry my ignorance, Paolo.
But why should I remove MAX_{VM,VCPU}_ID?Did you mean that check?
if (vm_id > MAX_VM_ID || vcpu_id > MAX_VCPU_ID) { fprintf(stderr, "Too big vm id %x or vcpu id %x\n", vm_id, vcpu_id); return NULL; }Wouldn't it be dangerous?
No, the check is only needed to avoid the buffer truncation from snprintf. If you use g_strdup_printf it's not needed anymore because there can be no truncation.
Paolo