From 66070bc19d510fbe1164666c7cc949fb6a7bc965 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Wed, 22 Jan 2020 13:54:56 +0100 Subject: [PATCH] Checks mbedtls_rsa_export return in fuzz targets --- programs/fuzz/fuzz_privkey.c | 4 +++- programs/fuzz/fuzz_pubkey.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/fuzz/fuzz_privkey.c b/programs/fuzz/fuzz_privkey.c index 533a647dc8..3685592f35 100644 --- a/programs/fuzz/fuzz_privkey.c +++ b/programs/fuzz/fuzz_privkey.c @@ -29,7 +29,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { mbedtls_mpi_init( &DQ ); mbedtls_mpi_init( &QP ); rsa = mbedtls_pk_rsa( pk ); - mbedtls_rsa_export( rsa, &N, &P, &Q, &D, &E ); + if ( mbedtls_rsa_export( rsa, &N, &P, &Q, &D, &E ) != 0 ) { + abort(); + } mbedtls_rsa_export_crt( rsa, &DP, &DQ, &QP ); mbedtls_mpi_free( &N ); mbedtls_mpi_free( &P ); mbedtls_mpi_free( &Q ); diff --git a/programs/fuzz/fuzz_pubkey.c b/programs/fuzz/fuzz_pubkey.c index df42f7d53b..3a59125bdb 100644 --- a/programs/fuzz/fuzz_pubkey.c +++ b/programs/fuzz/fuzz_pubkey.c @@ -20,7 +20,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { mbedtls_mpi_init( &DQ ); mbedtls_mpi_init( &QP ); rsa = mbedtls_pk_rsa( pk ); - ret = mbedtls_rsa_export( rsa, &N, &P, &Q, &D, &E ); + if ( mbedtls_rsa_export( rsa, &N, &P, &Q, &D, &E ) != 0 ) { + abort(); + } ret = mbedtls_rsa_export_crt( rsa, &DP, &DQ, &QP ); mbedtls_mpi_free( &N ); mbedtls_mpi_free( &P ); mbedtls_mpi_free( &Q );