diff options
| author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2012-08-23 18:52:48 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jeremy.kerr@canonical.com> | 2012-08-24 20:03:54 +0800 |
| commit | 41c741fe13967c74604e21087f3d55d344f409f2 (patch) | |
| tree | a870a281c1f085c83903c99a8652b80bc1c9bca9 | |
| parent | 16c09d22a61b0ea5e7ee4c4e5e57231a3ca701bc (diff) | |
| download | sbsigntools-41c741fe13967c74604e21087f3d55d344f409f2.tar.gz | |
sbkeysync: Improve error handling in read_firmware_key_database
We should free filename, and buf on error.
Also, check for the length of the file's data; we may be passed empty
files, and end up with a negative len.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
| -rw-r--r-- | src/sbkeysync.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/sbkeysync.c b/src/sbkeysync.c index 8e75649..5fa4479 100644 --- a/src/sbkeysync.c +++ b/src/sbkeysync.c @@ -321,6 +321,7 @@ static int read_firmware_key_database(struct key_database *kdb, char guid_str[GUID_STRLEN]; char *filename; uint8_t *buf; + int rc = -1; size_t len; guid_to_str(&kdb->type->guid, guid_str); @@ -328,16 +329,27 @@ static int read_firmware_key_database(struct key_database *kdb, filename = talloc_asprintf(kdb, "%s/%s-%s", dir, kdb->type->name, guid_str); - if (fileio_read_file_noerror(ctx, filename, &buf, &len)) - return -1; + buf = NULL; + rc = fileio_read_file_noerror(kdb, filename, &buf, &len); + if (rc) + goto out; /* efivars files start with a 32-bit attribute block */ + if (len < sizeof(uint32_t)) + goto out; + buf += sizeof(uint32_t); len -= sizeof(uint32_t); + rc = 0; sigdb_iterate(buf, len, sigdb_add_key, kdb); - return 0; +out: + if (rc) + talloc_free(buf); + talloc_free(filename); + + return rc; } struct keystore_add_ctx { |