[openssl] OpenSSL_1_1_1-stable update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Sat Nov 9 09:51:52 UTC 2019


The branch OpenSSL_1_1_1-stable has been updated
       via  eb67b2616c737fba2cb1207f70d3ecd003844705 (commit)
      from  30bd3e51600b53ec0a2df2d952bf2624309f3952 (commit)


- Log -----------------------------------------------------------------
commit eb67b2616c737fba2cb1207f70d3ecd003844705
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Nov 3 17:34:23 2019 +0100

    Fix a -Warray-bounds gcc warning in OPENSSL_DIR_read
    
    '__builtin_strncpy' offset [275, 4095] from the object at
    'direntry' is out of the bounds of referenced subobject 'd_name'
    with type 'char[256]' at offset 19
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10343)
    
    (cherry picked from commit db5cf86535b305378308c58c52596994e1ece1e6)

-----------------------------------------------------------------------

Summary of changes:
 crypto/LPdir_unix.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
index b1022895c8..bbbec0aee1 100644
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@@ -131,9 +131,8 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
         return 0;
     }
 
-    strncpy((*ctx)->entry_name, direntry->d_name,
-            sizeof((*ctx)->entry_name) - 1);
-    (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0';
+    OPENSSL_strlcpy((*ctx)->entry_name, direntry->d_name,
+                    sizeof((*ctx)->entry_name));
 #ifdef __VMS
     if ((*ctx)->expect_file_generations) {
         char *p = (*ctx)->entry_name + strlen((*ctx)->entry_name);


More information about the openssl-commits mailing list