diff options
| author | Matt Caswell <matt@openssl.org> | 2023-10-05 17:11:25 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-10-09 10:15:40 +0200 |
| commit | 581c87b088105db0bddaf80a572b45a23b74e929 (patch) | |
| tree | 902b283d97dc66b4625a0d842474dfd3721b23bb | |
| parent | 50b3c47b65e47a4f52ed1c47a0f248beb890193e (diff) | |
Fix the BIO_addr test
The BIO_addr test is failing on non-stop. The length of the data is larger
than the size we have allocated for it. We dynamically allocate instead.
Fixes #22218
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22294)
| -rw-r--r-- | test/bio_addr_test.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/test/bio_addr_test.c b/test/bio_addr_test.c index 9ca007e511..38ea3de36c 100644 --- a/test/bio_addr_test.c +++ b/test/bio_addr_test.c @@ -80,8 +80,9 @@ static BIO_ADDR *make_dummy_addr(int family) static int bio_addr_is_eq(const BIO_ADDR *a, const BIO_ADDR *b) { - struct sockaddr_storage adata, bdata; + unsigned char *adata = NULL, *bdata = NULL; size_t alen, blen; + int ret = 0; /* True even if a and b are NULL */ if (a == b) @@ -98,15 +99,11 @@ static int bio_addr_is_eq(const BIO_ADDR *a, const BIO_ADDR *b) if (BIO_ADDR_rawport(a) != BIO_ADDR_rawport(b)) return 0; - if (!BIO_ADDR_rawaddress(a, NULL, &alen) - || alen > sizeof(adata) - || !BIO_ADDR_rawaddress(a, &adata, &alen)) + if (!BIO_ADDR_rawaddress(a, NULL, &alen)) return 0; - if (!BIO_ADDR_rawaddress(a, NULL, &blen) - || blen > sizeof(bdata) - || !BIO_ADDR_rawaddress(a, &bdata, &blen)) - return 0; + if (!BIO_ADDR_rawaddress(b, NULL, &blen)) + goto err; if (alen != blen) return 0; @@ -114,7 +111,22 @@ static int bio_addr_is_eq(const BIO_ADDR *a, const BIO_ADDR *b) if (alen == 0) return 1; - return memcmp(&adata, &bdata, alen) == 0; + adata = OPENSSL_malloc(alen); + if (!TEST_ptr(adata) + || !BIO_ADDR_rawaddress(a, adata, &alen)) + goto err; + + bdata = OPENSSL_malloc(blen); + if (!TEST_ptr(bdata) + || !BIO_ADDR_rawaddress(b, bdata, &blen)) + goto err; + + ret = (memcmp(adata, bdata, alen) == 0); + + err: + OPENSSL_free(adata); + OPENSSL_free(bdata); + return ret; } static int test_bio_addr_copy_dup(int idx) |