system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand: More protection against malformed smbios tables

Browse source 
Add some more sanity checks to make sure we don't march off the end of
the table. Typically, smbios structures are well formed, or Windows
wouldn't boot. Sometimes they aren't, and this at least fails safe.

Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D39794
This commit is contained in:
Warner Losh 2023-05-01 15:12:41 -06:00
parent c5e433b99e
commit a5b4ec5281
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stand/libsa/smbios.c
View file

@ -520,19 +520,23 @@ smbios_find_struct(int type)
{
caddr_t dmi;
size_t i;
caddr_t ep;
if (smbios.addr == NULL)
return (NULL);
ep = smbios.addr + smbios.length;
for (dmi = smbios.addr, i = 0;
dmi < smbios.addr + smbios.length && i < smbios.count; i++) {
if (SMBIOS_GET8(dmi, 0) == type)
dmi < ep && i < smbios.count; i++) {
if (SMBIOS_GET8(dmi, 0) == type) {
return dmi;
}
/* Find structure terminator. */
dmi = SMBIOS_GETSTR(dmi);
while (SMBIOS_GET16(dmi, 0) != 0)
while (SMBIOS_GET16(dmi, 0) != 0 && dmi < ep) {
dmi++;
dmi += 2;
}
dmi += 2; /* For checksum */
}
return (NULL);