mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
a9064366e8
Running the x509_req_test with address sanitizer shows a memory leak:
==186455==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 53 byte(s) in 1 object(s) allocated from:
#0 0x3ffad5f47af in malloc (/lib64/libasan.so.8+0xf47af) (BuildId: 93b3d2536d76f772a95880d76c746c150daabbee)
#1 0x3ffac4214fb in CRYPTO_malloc crypto/mem.c:202
#2 0x3ffac421759 in CRYPTO_zalloc crypto/mem.c:222
#3 0x100e58f in test_mk_file_path test/testutil/driver.c:450
#4 0x1004671 in test_x509_req_detect_invalid_version test/x509_req_test.c:32
#5 0x100d247 in run_tests test/testutil/driver.c:342
#6 0x10042e3 in main test/testutil/main.c:31
#7 0x3ffaad34a5b in __libc_start_call_main (/lib64/libc.so.6+0x34a5b) (BuildId: 461b58df774538594b6173825bed67a9247a014d)
#8 0x3ffaad34b5d in __libc_start_main@GLIBC_2.2 (/lib64/libc.so.6+0x34b5d) (BuildId: 461b58df774538594b6173825bed67a9247a014d)
#9 0x1004569 (/root/openssl/test/x509_req_test+0x1004569) (BuildId: ab6bce0e531df1e3626a8f506d07f6ad7c7c6d57)
SUMMARY: AddressSanitizer: 53 byte(s) leaked in 1 allocation(s).
The certFilePath that is obtained via test_mk_file_path() must be freed when
no longer used.
While at it, make the certFilePath variable a local variable, there is no need
to have this a global static variable.
Fixes: 7d2c0a4b1f
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24715)
74 lines
1.9 KiB
C
74 lines
1.9 KiB
C
/*
|
|
* Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/pem.h>
|
|
#include <openssl/x509.h>
|
|
|
|
#include "testutil.h"
|
|
|
|
static char *certsDir = NULL;
|
|
|
|
/*
|
|
* Test for the missing X509 version check discussed in issue #5738 and
|
|
* added in PR #24677.
|
|
* This test tries to verify a malformed CSR with the X509 version set
|
|
* version 6, instead of 1. As this request is malformed, even its
|
|
* signature is valid, the verification must fail.
|
|
*/
|
|
static int test_x509_req_detect_invalid_version(void)
|
|
{
|
|
char *certFilePath;
|
|
BIO *bio = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
X509_REQ *req = NULL;
|
|
int ret = 0;
|
|
|
|
certFilePath = test_mk_file_path(certsDir, "x509-req-detect-invalid-version.pem");
|
|
if (certFilePath == NULL)
|
|
goto err;
|
|
if (!TEST_ptr(bio = BIO_new_file(certFilePath, "r")))
|
|
goto err;
|
|
req = PEM_read_bio_X509_REQ(bio, NULL, 0, NULL);
|
|
if (req == NULL) {
|
|
ret = 1; /* success, reading PEM with invalid CSR data is allowed to fail. */
|
|
goto err;
|
|
}
|
|
if (!TEST_ptr(pkey = X509_REQ_get_pubkey(req)))
|
|
goto err;
|
|
/* Verification MUST fail at this point. ret != 1. */
|
|
if (!TEST_int_ne(X509_REQ_verify(req, pkey), 1))
|
|
goto err;
|
|
ret = 1; /* success */
|
|
err:
|
|
EVP_PKEY_free(pkey);
|
|
X509_REQ_free(req);
|
|
BIO_free(bio);
|
|
OPENSSL_free(certFilePath);
|
|
return ret;
|
|
}
|
|
|
|
OPT_TEST_DECLARE_USAGE("certdir\n")
|
|
|
|
int setup_tests(void)
|
|
{
|
|
if (!test_skip_common_options()) {
|
|
TEST_error("Error parsing test options\n");
|
|
return 0;
|
|
}
|
|
if (!TEST_ptr(certsDir = test_get_argument(0)))
|
|
return 0;
|
|
|
|
ADD_TEST(test_x509_req_detect_invalid_version);
|
|
return 1;
|
|
}
|
|
|
|
void cleanup_tests(void)
|
|
{
|
|
}
|