diff options
| author | harshit <harshitsharmajs@gmail.com> | 2020-05-12 12:55:39 +0530 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-05-19 07:57:23 +0000 |
| commit | aae16330695ab1a3a3ed1a9068dc25bba00997fe (patch) | |
| tree | 5f9cacf7962470e8a60a668ebc163dd5ec69e4fa /src/security/tpm | |
| parent | fb6606b8dbf9711c86872e75ce472a98ffe1ba2d (diff) | |
| download | coreboot-aae16330695ab1a3a3ed1a9068dc25bba00997fe.tar.xz | |
security/tpm/tspi: Fix handling of white space delimited list
The current implementation uses strcmp() without splitting the list
and therefore returns false even when the string pointed to by
'name' is a part of 'whitelist'. The patch fixes this problem.
Also, update help text of CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA to
space delimited list to align it with the other lists we use.
Change-Id: Ifd285162ea6e562a5bb18325a1b767ac2e4276f3
Signed-off-by: Harshit Sharma <harshitsharmajs@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41280
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src/security/tpm')
| -rw-r--r-- | src/security/tpm/Kconfig | 2 | ||||
| -rw-r--r-- | src/security/tpm/tspi/crtm.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig index 6741614bb0..b6a7781d9a 100644 --- a/src/security/tpm/Kconfig +++ b/src/security/tpm/Kconfig @@ -112,6 +112,6 @@ config TPM_MEASURED_BOOT_RUNTIME_DATA depends on TPM_MEASURED_BOOT help Runtime data whitelist of cbfs filenames. Needs to be a - comma separated list + space delimited list endmenu # Trusted Platform Module (tpm) diff --git a/src/security/tpm/tspi/crtm.c b/src/security/tpm/tspi/crtm.c index 8bcc01bcbb..49daeb009b 100644 --- a/src/security/tpm/tspi/crtm.c +++ b/src/security/tpm/tspi/crtm.c @@ -88,17 +88,18 @@ static bool is_runtime_data(const char *name) const char *whitelist = CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA; size_t whitelist_len = sizeof(CONFIG_TPM_MEASURED_BOOT_RUNTIME_DATA) - 1; size_t name_len = strlen(name); - int i; + const char *end; if (!whitelist_len || !name_len) return false; - for (i = 0; (i + name_len) <= whitelist_len; i++) { - if (!strcmp(whitelist + i, name)) + while ((end = strchr(whitelist, ' '))) { + if (end - whitelist == name_len && !strncmp(whitelist, name, name_len)) return true; + whitelist = end + 1; } - return false; + return !strcmp(whitelist, name); } uint32_t tspi_measure_cbfs_hook(struct cbfsf *fh, const char *name) |