Fix memory leak in psa_cipher_finish()
@@ -2410,18 +2410,19 @@ psa_status_t psa_cipher_finish( psa_cipher_operation_t *operation,
size_t output_size,
size_t *output_length )
{
- int ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
+ psa_status_t status = PSA_ERROR_UNKNOWN_ERROR;
+ int cipher_ret = MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE;
uint8_t temp_output_buffer[MBEDTLS_MAX_BLOCK_LENGTH];
if( ! operation->key_set )
{
- psa_cipher_abort( operation );
- return( PSA_ERROR_BAD_STATE );
+ status = PSA_ERROR_BAD_STATE;
+ goto error;
}
if( operation->iv_required && ! operation->iv_set )
{
- psa_cipher_abort( operation );
- return( PSA_ERROR_BAD_STATE );
+ status = PSA_ERROR_BAD_STATE;
+ goto error;
}
if( operation->ctx.cipher.operation == MBEDTLS_ENCRYPT &&
PSA_ALG_IS_BLOCK_CIPHER( operation->alg ) )
@@ -2430,37 +2431,49 @@ psa_status_t psa_cipher_finish( psa_cipher_operation_t *operation,
operation->alg & PSA_ALG_BLOCK_CIPHER_PADDING_MASK;
if( operation->ctx.cipher.unprocessed_len >= operation->block_size )
{
- psa_cipher_abort( operation );
- return( PSA_ERROR_TAMPERING_DETECTED );
+ status = PSA_ERROR_TAMPERING_DETECTED;
+ goto error;
}
if( padding_mode == PSA_ALG_BLOCK_CIPHER_PAD_NONE )
{
if( operation->ctx.cipher.unprocessed_len != 0 )
{
- psa_cipher_abort( operation );
- return( PSA_ERROR_INVALID_ARGUMENT );
+ status = PSA_ERROR_INVALID_ARGUMENT;
+ goto error;
}
}
}
- ret = mbedtls_cipher_finish( &operation->ctx.cipher, temp_output_buffer,
+ cipher_ret = mbedtls_cipher_finish( &operation->ctx.cipher,
+ temp_output_buffer,
output_length );
- if( ret != 0 )
+ if( cipher_ret != 0 )
{
- psa_cipher_abort( operation );
- return( mbedtls_to_psa_error( ret ) );
+ status = mbedtls_to_psa_error( cipher_ret );
+ goto error;
}
+
if( *output_length == 0 )
- /* Nothing to copy. Note that output may be NULL in this case. */ ;
+ ; /* Nothing to copy. Note that output may be NULL in this case. */
else if( output_size >= *output_length )
memcpy( output, temp_output_buffer, *output_length );
else
{
- psa_cipher_abort( operation );
- return( PSA_ERROR_BUFFER_TOO_SMALL );
+ status = PSA_ERROR_BUFFER_TOO_SMALL;
+ goto error;
}
- return( PSA_SUCCESS );
+ status = psa_cipher_abort( operation );
+
+ return( status );
+
+error:
+
+ *output_length = 0;
+
+ (void) psa_cipher_abort( operation );
+
+ return( status );
}
psa_status_t psa_cipher_abort( psa_cipher_operation_t *operation )
