diff --git a/library/rsa.c b/library/rsa.c
index 9150e8745..2baf53257 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -856,6 +856,9 @@ int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
         bad |= *p++; /* Must be zero */
     }
 
+    if( pad_count < 8 )
+        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
     if( bad )
         return( MBEDTLS_ERR_RSA_INVALID_PADDING );