On Thu, Jul 09, 2026 at 10:56:09AM +0200, Markus Armbruster wrote: > Max Filippov <[email protected]> writes: > > > Fix new_argv allocation size to be `(argc + 2) * sizeof(char *)` bytes, > > which matches the way it's used to store `argc + 2` pointers. > > > > This fixes the test for me, which otherwise fails on xtensa with the > > following message > > > > linux-sigrtminmax.c: 59: main: Assertion `execve(new_argv[0], new_argv, > > environ) == 0' failed.'. > > > > Signed-off-by: Max Filippov <[email protected]> > > --- > > tests/tcg/multiarch/linux/linux-sigrtminmax.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tests/tcg/multiarch/linux/linux-sigrtminmax.c > > b/tests/tcg/multiarch/linux/linux-sigrtminmax.c > > index a7059aacd9cb..b5ea65f3d393 100644 > > --- a/tests/tcg/multiarch/linux/linux-sigrtminmax.c > > +++ b/tests/tcg/multiarch/linux/linux-sigrtminmax.c > > @@ -39,7 +39,7 @@ int main(int argc, char **argv) > > assert(qemu); > > > > if (!getenv("QEMU_RTSIG_MAP")) { > > - char **new_argv = malloc((argc + 2) + sizeof(char *)); > > + char **new_argv = malloc((argc + 2) * sizeof(char *)); > > If you can switch to glib's malloc, then g_new(argc + 2, sizeof(char *)) > is better. Yes, @argc can't become big enough for the multiplication to > overflow, but g_new() removes the need for reasoning.
The TCG unit tests don't link to GLib, only basic libc. Fortunately unit tests have a trusted caller (the QEMU meson build system), so we don't have to worry about malicious usage with overflow in this context. > > > int tsig1, hsig1, count1, tsig2, hsig2, count2; > > char rt_sigmap[64]; > > With regards, Daniel -- |: https://berrange.com ~~ https://hachyderm.io/@berrange :| |: https://libvirt.org ~~ https://entangle-photo.org :| |: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|
