From: Benjamin Kaduk Date: Tue, 8 Mar 2016 22:44:57 +0000 (-0600) Subject: Avoid negative array index in BIO_debug_callback() X-Git-Tag: OpenSSL_1_1_0-pre4~97 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a1673e1536729d49cb758b988ac7be368e9b1fdb;p=oweals%2Fopenssl.git Avoid negative array index in BIO_debug_callback() BIO_snprintf() can return -1 on truncation (and overflow as of commit 9cb177301fdab492e4cfef376b28339afe3ef663). Though neither can realistically occur while printing a pointer and short fixed string into a buffer of length 256, the analysis to confirm that this the case goes somewhat far up the call chain, and not all static analyzers can successfully follow the chain of logic. It's easy enough to clamp the returned length to be nonnegative before continuing, which appeases the static analyzer and does not harm the subsequent code. Reviewed-by: Richard Levitte Reviewed-by: Rich Salz --- diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c index 4d3365e4ec..ec484b697b 100644 --- a/crypto/bio/bio_cb.c +++ b/crypto/bio/bio_cb.c @@ -77,6 +77,9 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp, len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio); + /* Ignore errors and continue printing the other information. */ + if (len < 0) + len = 0; p = buf + len; p_maxlen = sizeof(buf) - len;