diff options
| author |   Eric Biggers <ebiggers@google.com> | 2022-01-18 16:13:05 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2022-01-31 11:21:44 +1100 |
| commit | a24611ea356c7f3f0ec926da11b9482ac1f414fd (patch) | |
| tree | 0036f840ac3d82bef06c15abefac3ca522d31462 /crypto | |
| parent | crypto: rsa-pkcs1pad - restore signature length check (diff) | |
| download | linux-dev-a24611ea356c7f3f0ec926da11b9482ac1f414fd.tar.xz linux-dev-a24611ea356c7f3f0ec926da11b9482ac1f414fd.zip | |
crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete()
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: <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>
Diffstat (limited to 'crypto')
| -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 6b556ddeb3a0..9d804831c8b3 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; |