Skip to content

Commit

Permalink
hw/smbios: Fix OEM strings table option validation
Browse files Browse the repository at this point in the history
qemu_smbios_type11_opts did not have the list terminator and that
resulted in out-of-bound memory access. It also needs to have an element
for the type option.

Cc: qemu-stable@nongnu.org
Fixes: 2d6dcbf ("smbios: support setting OEM strings table")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(cherry picked from commit cd8a35b)
  • Loading branch information
akihikodaki authored and Michael Tokarev committed Feb 13, 2024
1 parent 6eeeb87 commit d6e07d5
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions hw/smbios/smbios.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,11 @@ static const QemuOptDesc qemu_smbios_type8_opts[] = {
};

static const QemuOptDesc qemu_smbios_type11_opts[] = {
{
.name = "type",
.type = QEMU_OPT_NUMBER,
.help = "SMBIOS element type",
},
{
.name = "value",
.type = QEMU_OPT_STRING,
Expand All @@ -379,6 +384,7 @@ static const QemuOptDesc qemu_smbios_type11_opts[] = {
.type = QEMU_OPT_STRING,
.help = "OEM string data from file",
},
{ /* end of list */ }
};

static const QemuOptDesc qemu_smbios_type17_opts[] = {
Expand Down

0 comments on commit d6e07d5

Please sign in to comment.