Skip to content

Fix wrong DMI structures count #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
licliu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wrong DMI structures count #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/dmidecode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6241,13 +6241,17 @@ static void dmi_table(Log_t *logp, int type, u32 base, u32 len, u16 num, u32 ver
dmixml_AddAttribute(handle_n, "type", "%i", type);
dmixml_AddAttribute(handle_n, "notfound", "1");
}

if(i != num) {
/*
* SMBIOS v3 64-bit entry points do not announce a structures count,
* and only indicate a maximum size for the table.
*/
if(num && i != num) {
log_append(logp, LOGFL_NODUPS, LOG_WARNING,
"Wrong DMI structures count: %d announced, only %d decoded.", num, i);
}

if(data - buf != len) {
if((unsigned long)(data - buf) > len
|| (num && (unsigned long)(data - buf) < len)) {
log_append(logp, LOGFL_NODUPS, LOG_WARNING,
"Wrong DMI structures length: %d bytes announced, structures occupy %d bytes.",
len, (unsigned int)(data - buf));
Expand Down
4 changes: 0 additions & 4 deletions src/efi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ int address_from_efi(Log_t *logp, size_t * address)
log_append(logp, LOGFL_NODUPS, LOG_WARNING, "%s: SMBIOS entry point missing", filename);
}

if(ret == 0){
log_append(logp, LOGFL_NODUPS, LOG_DEBUG, "%s: entry point at 0x%08llx", eptype, (unsigned long long)*address);
}

return ret;
}