]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
smbios: Fix buffer overrun when using path= option
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 23 Mar 2025 21:35:54 +0000 (22:35 +0100)
committerPhilippe Mathieu-Daudé <philmd@linaro.org>
Tue, 8 Apr 2025 18:45:13 +0000 (20:45 +0200)
We have to make sure the array of bytes read from the path= file
is null-terminated, otherwise we run into a buffer overrun later on.

Fixes: bb99f4772f54017490e3356ecbb3df25c5d4537f ("hw/smbios: support loading OEM strings values from a file")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2879

Signed-off-by: Daan De Meyer <daan.j.demeyer@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Valentin David <valentin.david@canonical.com>
Message-ID: <20250323213622.2581013-1-daan.j.demeyer@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
hw/smbios/smbios.c

index 02a09eb9cd05e3513ad7501b0316cef76197db04..ad4cd6721e618973d2f8b15423257373ca0d81f8 100644 (file)
@@ -1285,6 +1285,9 @@ static int save_opt_one(void *opaque,
             g_byte_array_append(data, (guint8 *)buf, ret);
         }
 
+        buf[0] = '\0';
+        g_byte_array_append(data, (guint8 *)buf, 1);
+
         qemu_close(fd);
 
         *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1);