diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2016-03-08 16:44:57 -0600 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2016-03-09 20:52:19 -0500 |
| commit | a1673e1536729d49cb758b988ac7be368e9b1fdb (patch) | |
| tree | 04eba61c46623b06f50f0861ecc44aaf426b3d70 /crypto/bio | |
| parent | 80e8fdbe793c8861411e9f49ea290847fa99f4c7 (diff) | |
| download | openssl-a1673e1536729d49cb758b988ac7be368e9b1fdb.zip openssl-a1673e1536729d49cb758b988ac7be368e9b1fdb.tar.gz openssl-a1673e1536729d49cb758b988ac7be368e9b1fdb.tar.bz2 | |
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 <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bio_cb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c index 4d3365e..ec484b6 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; |