Accepting request 879863 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/879863
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=135

0034-smbios-Fix-table-whit-no-string-is-.patch

@@ -0,0 +1,28 @@
+From 62b45b6d77924c396a59caac252169ccf7ef525a Mon Sep 17 00:00:00 2001
+From: Matthias Brugger <mbrugger@suse.com>
+Date: Wed, 17 Mar 2021 12:43:03 +0100
+Subject: [PATCH] smbios: Fix table whit no string is present
+
+When no string is present a table has to end with two \0 bytes.
+Take this into account. This is a downstream fix.
+
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ lib/smbios.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/smbios.c b/lib/smbios.c
+index 485a812c77..c68d19e12b 100644
+--- a/lib/smbios.c
++++ b/lib/smbios.c
+@@ -105,6 +105,10 @@ static int smbios_string_table_len(char *start)
+ 		len += i;
+ 	}
+ 
++	/* A table without a string has to end with \0\0 */
++	if (len == 0)
++		return 2;
++
+ 	return len + 1;
+ }
+ 

u-boot.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 17 11:46:02 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
+
+Fix SMBIOS tables without a string present (bsc#1183079)
+
+Patch queue updated from https://github.com/openSUSE/u-boot.git tumbleweed-2021.01
+* Patches added:
+  0034-smbios-Fix-table-whit-no-string-is-.patch
+
 -------------------------------------------------------------------
 Thu Mar  4 14:59:52 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
 

u-boot.spec

@@ -257,6 +257,7 @@ Patch0030:      0030-fs-btrfs-Select-SHA256-in-Kconfig.patch
 Patch0031:      0031-efi_loader-Avoid-emitting-efi_var_b.patch
 Patch0032:      0032-configs-BPI-R2-Disable-EFI-Grub-wor.patch
 Patch0033:      0033-configs-RPi2-Disable-EFI-Grub-worka.patch
+Patch0034:      0034-smbios-Fix-table-whit-no-string-is-.patch
 # Patches: end
 BuildRequires:  bc
 BuildRequires:  bison