[openssl] master update

kaduk at mit.edu kaduk at mit.edu
Mon Jan 11 23:51:21 UTC 2021


The branch master has been updated
       via  3ddf44ea5a2c1c8c55f4f4072a611791c79d4e7c (commit)
      from  678cae0295e3fe600edc049742b8c765a58edebc (commit)


- Log -----------------------------------------------------------------
commit 3ddf44ea5a2c1c8c55f4f4072a611791c79d4e7c
Author: John Baldwin <jhb at FreeBSD.org>
Date:   Thu Jan 7 14:09:41 2021 -0800

    Close /dev/crypto file descriptor after CRIOGET ioctl().
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/13807)

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

Summary of changes:
 engines/e_devcrypto.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index d549edfd29..e1c4372f72 100644
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -1236,9 +1236,11 @@ static int open_devcrypto(void)
 #ifdef CRIOGET
     if (ioctl(fd, CRIOGET, &cfd) < 0) {
         fprintf(stderr, "Could not create crypto fd: %s\n", strerror(errno));
+        close(fd);
         cfd = -1;
         return 0;
     }
+    close(fd);
 #else
     cfd = fd;
 #endif


More information about the openssl-commits mailing list