diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-01-18 16:13:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-15 14:18:03 +0200 |
| commit | 4f7a0bc04e4e7d8e8b558d2733ef485bc1f2a4be (patch) | |
| tree | d7056404d51955da84c415e30f080d505413e24c | |
| parent | 44fe7e8c24680cb632f9e97f8d800538932ec9a0 (diff) | |
| download | linux-crypto-4f7a0bc04e4e7d8e8b558d2733ef485bc1f2a4be.tar.gz linux-crypto-4f7a0bc04e4e7d8e8b558d2733ef485bc1f2a4be.zip | |
crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete()
commit a24611ea356c7f3f0ec926da11b9482ac1f414fd upstream.
Before checking whether the expected digest_info is present, we need to
check that there are enough bytes remaining.
Fixes: 39669c60ba49 ("crypto: Add hash param to pkcs1pad")
Cc: <stable@vger.kernel.org> # v4.6+
Cc: Tadeusz Struk <tadeusz.struk@linaro.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/rsa-pkcs1pad.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c index b8d45c25..9cbafaf6 100644 --- a/crypto/rsa-pkcs1pad.c +++ b/crypto/rsa-pkcs1pad.c @@ -475,6 +475,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; |