proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-22 08:55:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm: Fix a critical warning when loading an empty TPM eventlog item

Browse Source
This commit is contained in:
Richard Hughes 2022-02-09 13:46:30 +00:00
parent 171ebda355
commit fd399da71b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/tpm/fu-plugin-tpm.c
View File

@ -259,8 +259,11 @@ fu_plugin_tpm_eventlog_report_metadata(FuPlugin *plugin)
for (guint i = 0; i < data->ev_items->len; i++) { for (guint i = 0; i < data->ev_items->len; i++) {
FuTpmEventlogItem *item = g_ptr_array_index(data->ev_items, i); FuTpmEventlogItem *item = g_ptr_array_index(data->ev_items, i);
g_autofree gchar *blobstr = fu_tpm_eventlog_blobstr(item->blob); g_autofree gchar *blobstr = NULL;
g_autofree gchar *checksum = NULL; g_autofree gchar *checksum = NULL;
if (item->blob == NULL)
continue;
if (item->checksum_sha1 != NULL) if (item->checksum_sha1 != NULL)
checksum = fu_tpm_eventlog_strhex(item->checksum_sha1); checksum = fu_tpm_eventlog_strhex(item->checksum_sha1);
else if (item->checksum_sha256 != NULL) else if (item->checksum_sha256 != NULL)
@ -268,6 +271,7 @@ fu_plugin_tpm_eventlog_report_metadata(FuPlugin *plugin)
else else
continue; continue;
g_string_append_printf(str, "0x%08x %s", item->kind, checksum); g_string_append_printf(str, "0x%08x %s", item->kind, checksum);
blobstr = fu_tpm_eventlog_blobstr(item->blob);
if (blobstr != NULL) if (blobstr != NULL)
g_string_append_printf(str, " [%s]", blobstr); g_string_append_printf(str, " [%s]", blobstr);
g_string_append(str, "\n"); g_string_append(str, "\n");

3
plugins/tpm/fu-tpm-eventlog-common.c
View File

@ -149,6 +149,9 @@ fu_tpm_eventlog_blobstr(GBytes *blob)
const guint8 *buf = g_bytes_get_data(blob, &bufsz); const guint8 *buf = g_bytes_get_data(blob, &bufsz);
g_autoptr(GString) str = g_string_new(NULL); g_autoptr(GString) str = g_string_new(NULL);
g_return_val_if_fail(blob != NULL, NULL);
buf = g_bytes_get_data(blob, &bufsz);
for (gsize i = 0; i < bufsz; i++) { for (gsize i = 0; i < bufsz; i++) {
gchar chr = buf[i]; gchar chr = buf[i];
if (g_ascii_isprint(chr)) { if (g_ascii_isprint(chr)) {