diff --git a/library/rsa.c b/library/rsa.c
index cb32bf46f..642b76278 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -714,6 +714,10 @@ int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
      */
     hlen = mbedtls_md_get_size( md_info );
 
+    // checking for integer underflow
+    if( 2 * hlen + 2 > ilen )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
     mbedtls_md_init( &md_ctx );
     mbedtls_md_setup( &md_ctx, md_info, 0 );