From: Matthias Brugger <mbrugger@suse.com>
Date: Tue, 6 Apr 2021 09:04:35 +0000 (+0200)
Subject: smbios: Fix table when no string is present
X-Git-Url: http://git.dujemihanovic.xyz/html/static/gitweb.css?a=commitdiff_plain;h=e31efe50b5cce46a2ee68c96db445e0a3d481aa8;p=u-boot.git

smbios: Fix table when no string is present

When no string is present in a table, next_ptr points to the same
location as eos. When calculating the string table length, we would only
reserve one \0. By spec a SMBIOS table has to end with two \0\0 when no
strings a present.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---

diff --git a/lib/smbios.c b/lib/smbios.c
index 11b7611a84..0ae857855e 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -312,6 +312,10 @@ int smbios_update_version(const char *version)
  */
 static int smbios_string_table_len(const struct smbios_ctx *ctx)
 {
+	/* In case no string is defined we have to return two \0 */
+	if (ctx->next_ptr == ctx->eos)
+		return 2;
+
 	/* Allow for the final \0 after all strings */
 	return (ctx->next_ptr + 1) - ctx->eos;
 }