[PATCH v2 0/2] hw/smbios: Fix option validation

[PATCH v2 0/2] hw/smbios: Fix option validation

[Akihiko Odaki]

This fixes qemu_smbios_type8_opts and qemu_smbios_type11_opts to have
list terminators and elements for the type option.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
Changes in v2:
- Fixed messages. (Michael Tokarev)
- Link to v1: https://lore.kernel.org/r/20240128-smbios-v1-0-c3a50499baea@daynix.com

---
Akihiko Odaki (2):
      hw/smbios: Fix OEM strings table option validation
      hw/smbios: Fix port connector option validation

 hw/smbios/smbios.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
---
base-commit: f614acb7450282a119d85d759f27eae190476058
change-id: 20240128-smbios-be5c321d7158

Best regards,
-- 
Akihiko Odaki <akihiko.odaki@daynix.com>

[PATCH v2 1/2] hw/smbios: Fix OEM strings table option validation

[Akihiko Odaki]

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: 2d6dcbf93fb0 ("smbios: support setting OEM strings table")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/smbios/smbios.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 2a90601ac5d9..522ed1ed9fe3 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -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,
@@ -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[] = {

-- 
2.43.0

Re: [PATCH v2 1/2] hw/smbios: Fix OEM strings table option validation

[Ani Sinha]

> On 29-Jan-2024, at 13:33, Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
> 
> 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: 2d6dcbf93fb0 ("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>
> ---
> hw/smbios/smbios.c | 6 ++++++
> 1 file changed, 6 insertions(+)
> 
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 2a90601ac5d9..522ed1ed9fe3 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -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,
> @@ -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[] = {
> 
> -- 
> 2.43.0
> 

[PATCH v2 2/2] hw/smbios: Fix port connector option validation

[Akihiko Odaki]

qemu_smbios_type8_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: fd8caa253c56 ("hw/smbios: support for type 8 (port connector)")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/smbios/smbios.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 522ed1ed9fe3..8a44d3f271de 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -346,6 +346,11 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = {
 };
 
 static const QemuOptDesc qemu_smbios_type8_opts[] = {
+    {
+        .name = "type",
+        .type = QEMU_OPT_NUMBER,
+        .help = "SMBIOS element type",
+    },
     {
         .name = "internal_reference",
         .type = QEMU_OPT_STRING,
@@ -366,6 +371,7 @@ static const QemuOptDesc qemu_smbios_type8_opts[] = {
         .type = QEMU_OPT_NUMBER,
         .help = "port type",
     },
+    { /* end of list */ }
 };
 
 static const QemuOptDesc qemu_smbios_type11_opts[] = {

-- 
2.43.0

Re: [PATCH v2 2/2] hw/smbios: Fix port connector option validation

[Ani Sinha]

> On 29-Jan-2024, at 13:33, Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
> 
> qemu_smbios_type8_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: fd8caa253c56 ("hw/smbios: support for type 8 (port connector)")
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>

Reviewed-by: Ani Sinha <anisinha@redhat.com>

> ---
> hw/smbios/smbios.c | 6 ++++++
> 1 file changed, 6 insertions(+)
> 
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 522ed1ed9fe3..8a44d3f271de 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -346,6 +346,11 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = {
> };
> 
> static const QemuOptDesc qemu_smbios_type8_opts[] = {
> +    {
> +        .name = "type",
> +        .type = QEMU_OPT_NUMBER,
> +        .help = "SMBIOS element type",
> +    },
>     {
>         .name = "internal_reference",
>         .type = QEMU_OPT_STRING,
> @@ -366,6 +371,7 @@ static const QemuOptDesc qemu_smbios_type8_opts[] = {
>         .type = QEMU_OPT_NUMBER,
>         .help = "port type",
>     },
> +    { /* end of list */ }
> };
> 
> static const QemuOptDesc qemu_smbios_type11_opts[] = {
> 
> -- 
> 2.43.0
> 

Re: [PATCH v2 0/2] hw/smbios: Fix option validation

[Michael Tokarev]

29.01.2024 11:03, Akihiko Odaki:
> This fixes qemu_smbios_type8_opts and qemu_smbios_type11_opts to have
> list terminators and elements for the type option.

> Akihiko Odaki (2):
>        hw/smbios: Fix OEM strings table option validation
>        hw/smbios: Fix port connector option validation
> 
>   hw/smbios/smbios.c | 12 ++++++++++++
>   1 file changed, 12 insertions(+)

Should I pick this up via the trivial-patches tree perhaps?
The changes are trivial enough.  Picking up there, unless there's
a pull request pending for smbios area.

Thanks,

/mjt

Re: [PATCH v2 0/2] hw/smbios: Fix option validation

[Michael S. Tsirkin]

On Sun, Feb 04, 2024 at 07:57:48AM +0300, Michael Tokarev wrote:
> 29.01.2024 11:03, Akihiko Odaki:
> > This fixes qemu_smbios_type8_opts and qemu_smbios_type11_opts to have
> > list terminators and elements for the type option.
> 
> > Akihiko Odaki (2):
> >        hw/smbios: Fix OEM strings table option validation
> >        hw/smbios: Fix port connector option validation
> > 
> >   hw/smbios/smbios.c | 12 ++++++++++++
> >   1 file changed, 12 insertions(+)
> 
> Should I pick this up via the trivial-patches tree perhaps?
> The changes are trivial enough.  Picking up there, unless there's
> a pull request pending for smbios area.
> 
> Thanks,

Fine, sure

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>


> /mjt