d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load_key_buf do not free data from dearmor

Browse Source 
The data returned by dearmor is referenced by the key
leave it alone!

Reviewed by:	stevek
MFC after:	2 days
This commit is contained in:
Simon J. Gerraty 2019-05-19 20:24:17 +00:00
parent 001ec17e68
commit e5ec655d67
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=347980
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libsecureboot/openpgp/opgp_key.c
View File

@ -168,6 +168,7 @@ load_key_buf(unsigned char *buf, size_t nbytes)
initialize(); initialize();
if (!(buf[0] & OPENPGP_TAG_ISTAG)) { if (!(buf[0] & OPENPGP_TAG_ISTAG)) {
/* Note: we do *not* free data */
data = dearmor((char *)buf, nbytes, &nbytes); data = dearmor((char *)buf, nbytes, &nbytes);
ptr = data; ptr = data;
} else } else
@ -190,7 +191,6 @@ load_key_buf(unsigned char *buf, size_t nbytes)
} }
} }
} }
free(data);
return (key); return (key);
} }
@ -209,8 +209,10 @@ openpgp_trust_add(OpenPGP_key *key)
LIST_INIT(&trust_list); LIST_INIT(&trust_list);
} }
if (key) if (key) {
DEBUG_PRINTF(2, ("openpgp_trust_add(%s)\n", key->id));
LIST_INSERT_HEAD(&trust_list, key, entries); LIST_INSERT_HEAD(&trust_list, key, entries);
}
} }
/** /**
@ -296,6 +298,7 @@ load_key_id(const char *keyID)
if (!key) if (!key)
key = load_trusted_key_id(keyID); key = load_trusted_key_id(keyID);
#endif #endif
DEBUG_PRINTF(2, ("load_key_id(%s): %s\n", keyID, key ? "found" : "nope"));
return (key); return (key);
} }

1
lib/libsecureboot/openpgp/opgp_sig.c
View File

@ -318,6 +318,7 @@ openpgp_verify(const char *filename,
sdata = ddata = dearmor((char *)sdata, sbytes, &sbytes); sdata = ddata = dearmor((char *)sdata, sbytes, &sbytes);
ptr = sdata; ptr = sdata;
rc = decode_packet(2, &ptr, sbytes, (decoder_t)decode_sig, sig); rc = decode_packet(2, &ptr, sbytes, (decoder_t)decode_sig, sig);
DEBUG_PRINTF(2, ("rc=%d keyID=%s\n", rc, sig->key_id ? sig->key_id : "?"));
if (rc == 0 && sig->key_id) { if (rc == 0 && sig->key_id) {
key = load_key_id(sig->key_id); key = load_key_id(sig->key_id);
if (!key) { if (!key) {