summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJason King <jason.king@joyent.com>2018-05-08 21:44:21 -0500
committerGordon Ross <gwr@nexenta.com>2018-07-12 19:39:37 -0400
commit3c4342ab5aea1aeb83d0d4e34d215f0e113daba1 (patch)
treedb8b919dab5b50322c1df833c687b13404146ce2 /usr/src
parent2cf2b01e17654840a521746eefea832fb41b79bd (diff)
downloadillumos-gate-3c4342ab5aea1aeb83d0d4e34d215f0e113daba1.tar.gz
9644 Double-free in crypto tests on failure
Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Mike Zeller <mike.zeller@joyent.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Andrew Stormont <astormont@racktopsystems.com> Reviewed by: Yuri Pankov <yuripv@yuripv.net> Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/test/crypto-tests/tests/common/cryptotest_kcf.c3
-rw-r--r--usr/src/test/crypto-tests/tests/common/cryptotest_pkcs.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/test/crypto-tests/tests/common/cryptotest_kcf.c b/usr/src/test/crypto-tests/tests/common/cryptotest_kcf.c
index 260821dcac..f19aa0b7c2 100644
--- a/usr/src/test/crypto-tests/tests/common/cryptotest_kcf.c
+++ b/usr/src/test/crypto-tests/tests/common/cryptotest_kcf.c
@@ -11,6 +11,7 @@
/*
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2018, Joyent, Inc.
*/
#include <fcntl.h>
@@ -134,7 +135,6 @@ get_mech_info(crypto_op_t *op)
(uint_t *)&get_number, "get_mech_info") != CRYPTO_SUCCESS) {
(void) fprintf(stderr, "failed to resolve mechanism name %s\n",
op->mechname);
- (void) cryptotest_close(op);
return (CTEST_NAME_RESOLVE_FAILED);
}
op->mech = get_number.pn_internal_number;
@@ -158,7 +158,6 @@ get_hsession_by_mech(crypto_op_t *op)
(void) fprintf(stderr,
"could not find provider for mechanism %llu\n",
mech.mech_type);
- (void) cryptotest_close(op);
return (CTEST_MECH_NO_PROVIDER);
}
diff --git a/usr/src/test/crypto-tests/tests/common/cryptotest_pkcs.c b/usr/src/test/crypto-tests/tests/common/cryptotest_pkcs.c
index db15968b49..0506110e3c 100644
--- a/usr/src/test/crypto-tests/tests/common/cryptotest_pkcs.c
+++ b/usr/src/test/crypto-tests/tests/common/cryptotest_pkcs.c
@@ -104,7 +104,6 @@ get_mech_info(crypto_op_t *op)
cryptotest_error("get_mech_info", rv);
(void) fprintf(stderr, "failed to resolve mechanism name %s\n",
op->mechname);
- (void) cryptotest_close(op);
return (CTEST_NAME_RESOLVE_FAILED);
}
return (rv);
@@ -121,7 +120,6 @@ get_hsession_by_mech(crypto_op_t *op)
(void) fprintf(stderr,
"could not find provider for mechanism %lu\n",
op->mech);
- (void) cryptotest_close(op);
return (CTEST_MECH_NO_PROVIDER);
}
return (rv);