From: Eric Biggers ebiggers@google.com
Before checking whether the expected digest_info is present, we need to check that there are enough bytes remaining.
Fixes: a49de377e051 ("crypto: Add hash param to pkcs1pad") Cc: Tadeusz Struk tadeusz.struk@linaro.org Cc: stable@vger.kernel.org # v4.6+ Signed-off-by: Eric Biggers ebiggers@google.com --- crypto/rsa-pkcs1pad.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c index 7b223adebabf..6cd24b4b9b9e 100644 --- a/crypto/rsa-pkcs1pad.c +++ b/crypto/rsa-pkcs1pad.c @@ -476,6 +476,8 @@ static int pkcs1pad_verify_complete(struct akcipher_request *req, int err) pos++;
if (digest_info) { + if (digest_info->size > dst_len - pos) + goto done; if (crypto_memneq(out_buf + pos, digest_info->data, digest_info->size)) goto done;