Skip to contentSkip to conversation

smbios: Add an explicit bounds check for Type 9 length

PATCH Superseded Raymond Mao 2 participants 2 messages Apr 7 – Apr 12 Library code

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 smbios: Add an explicit bounds check for Type 9 length

From: Raymond Mao <[email protected]>

Fix Coverity Scan defect on Type 9 length.
Type 9 formatted length is built dynamically from peer_grouping_count. Although peer_grouping_count is a byte, the resulting formatted area still must fit in the SMBIOS header length field (u8).
Add an explicit bounds check before extending len, so the size used by map_sysmem() and memset() is guaranteed to be valid and consistent with hdr.length.

Fixes a8442c226635 ("smbios: add support for dynamic generation of Type 9 system slot tables")

Addresses-Coverity-ID: CID 645487: Insecure data handling (TAINTED_SCALAR)

---
 lib/smbios.c | 3 +++
 1 file changed, 3 insertions(+)
lib/smbios.c +3 -0
index d5f18c8bd69..18c48b15d2a 100644
@@ -1093,6 +1093,9 @@ static int smbios_write_type9_1slot(ulong *current, int handle,
 	 * TODO:
 	 * peer_groups = <peer_grouping_count> * SMBIOS_TYPE9_PGROUP_SIZE
 	 */
+	if (len + pgroups_size > U8_MAX)
+		return -EINVAL;
+
 	len += pgroups_size;
 
 	t = map_sysmem(*current, len);
Signature · 1 line
2.25.1
#1 lore raw

Hi Raymond,

Quoted 19 lines · Raymond Mao

smbios: Add an explicit bounds check for Type 9 length

Fix Coverity Scan defect on Type 9 length.
Type 9 formatted length is built dynamically from peer_grouping_count. Although peer_grouping_count is a byte, the resulting formatted area still must fit in the SMBIOS header length field (u8).
Add an explicit bounds check before extending len, so the size used by map_sysmem() and memset() is guaranteed to be valid and consistent with hdr.length.

Fixes a8442c226635 ("smbios: add support for dynamic generation of Type 9 system slot tables")

Addresses-Coverity-ID: CID 645487: Insecure data handling (TAINTED_SCALAR)

lib/smbios.c | 3 +++

 1 file changed, 3 insertions(+)

lib/smbios.c static int smbios_write_type9_1slot(ulong *current, int handle, · line 1094

Quoted 2 lines
lib/smbios.c +2 -0
@@ -1093,6 +1093,9 @@ static int smbios_write_type9_1slot(ulong *current, int handle,
+     if (len + pgroups_size > U8_MAX)
+             return -EINVAL;

The callers accumulate the return value with 'len +=' so returning a negative error code will corrupt the total length. The convention in this file is to return 0 on error.

Having said that, you could perhaps change this.

Regards,
Simon