From: Andy Polyakov <appro@openssl.org>
Date: Mon, 21 May 2018 12:26:54 +0000 (+0200)
Subject: apps/speed.c: address asan failure with small -bytes and large -misalign.
X-Git-Tag: OpenSSL_1_1_1-pre8~111
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2fc45cb805f85589bb49c3669864152e909696da;p=oweals%2Fopenssl.git

apps/speed.c: address asan failure with small -bytes and large -misalign.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6311)
---

diff --git a/apps/speed.c b/apps/speed.c
index 3af6971a1a..768e3a1ad3 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1690,7 +1690,10 @@ int speed_main(int argc, char **argv)
             }
         }
 
-        buflen = lengths[size_num - 1] + MAX_MISALIGNMENT + 1;
+        buflen = lengths[size_num - 1];
+        if (buflen < 36)    /* size of random vector in RSA bencmark */
+            buflen = 36;
+        buflen += MAX_MISALIGNMENT + 1;
         loopargs[i].buf_malloc = app_malloc(buflen, "input buffer");
         loopargs[i].buf2_malloc = app_malloc(buflen, "input buffer");
         memset(loopargs[i].buf_malloc, 0, buflen);