diff options
| author | Matt Caswell <matt@openssl.org> | 2019-11-26 17:15:20 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-11-29 14:21:55 +0000 |
| commit | 17197a2f61d04314b465b71a4ce164b5e219f15c (patch) | |
| tree | c29704c6ca5c958adb250a42581da3feabd9d3fb /crypto | |
| parent | c1ff5994407bc093eca78eb2fd4f813b7ee581a2 (diff) | |
Check the return from OPENSSL_buf2hexstr()
The function OPENSSL_buf2hexstr() can return NULL if it fails to allocate
memory so the callers should check its return value.
Fixes #10525
Reported-by: Ziyang Li (@Liby99)
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10526)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/err/err_prn.c | 3 | ||||
| -rw-r--r-- | crypto/mem_dbg.c | 4 | ||||
| -rw-r--r-- | crypto/x509/v3_akey.c | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c index 27e987e0e1..e0184b0771 100644 --- a/crypto/err/err_prn.c +++ b/crypto/err/err_prn.c @@ -36,7 +36,8 @@ void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u), data = ""; hex = OPENSSL_buf2hexstr((const unsigned char *)&tid, sizeof(tid)); BIO_snprintf(buf, sizeof(buf), "%s:error:%s:%s:%s:%s:%d:%s\n", - hex, lib, func, reason, file, line, data); + hex == NULL ? "<null>" : hex, lib, func, reason, file, + line, data); OPENSSL_free(hex); if (cb(buf, strlen(buf), u) <= 0) break; /* abort outputting the error report */ diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 779ad3cec9..561dd80437 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -374,8 +374,8 @@ static void print_leak(const MEM *m, MEM_LEAK *l) hex = OPENSSL_buf2hexstr((const unsigned char *)&m->threadid, sizeof(m->threadid)); - n = BIO_snprintf(bufp, len, "thread=%s, number=%d, address=%p\n", hex, - m->num, m->addr); + n = BIO_snprintf(bufp, len, "thread=%s, number=%d, address=%p\n", + hex == NULL ? "<null>" : hex, m->num, m->addr); OPENSSL_free(hex); if (n <= 0) return; diff --git a/crypto/x509/v3_akey.c b/crypto/x509/v3_akey.c index b656b4b502..4898869b0b 100644 --- a/crypto/x509/v3_akey.c +++ b/crypto/x509/v3_akey.c @@ -42,13 +42,22 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, char *tmp; if (akeyid->keyid) { tmp = OPENSSL_buf2hexstr(akeyid->keyid->data, akeyid->keyid->length); - X509V3_add_value((akeyid->issuer || akeyid->serial) ? "keyid" : NULL, tmp, &extlist); + if (tmp == NULL) { + ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); + return NULL; + } + X509V3_add_value((akeyid->issuer || akeyid->serial) ? "keyid" : NULL, + tmp, &extlist); OPENSSL_free(tmp); } if (akeyid->issuer) extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist); if (akeyid->serial) { tmp = OPENSSL_buf2hexstr(akeyid->serial->data, akeyid->serial->length); + if (tmp == NULL) { + ERR_raise(ERR_LIB_X509V3, ERR_R_MALLOC_FAILURE); + return NULL; + } X509V3_add_value("serial", tmp, &extlist); OPENSSL_free(tmp); } |