diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-27 03:07:20 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-27 03:07:20 +0200 |
| commit | 5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a (patch) | |
| tree | 6edb13ed37d842ef0b70d072b94e4c78010f90cf /lib/digsig.c | |
| parent | close the race in nlmsvc_free_block() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.tar.xz linux-5905db5ca0ac9a6d5bfe87f86b87cd1bdec3755a.zip | |
Merge remote branch 'origin' into for-next
Diffstat (limited to 'lib/digsig.c')
| -rw-r--r-- | lib/digsig.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/digsig.c b/lib/digsig.c index 286d558033e2..8c0e62975c88 100644 --- a/lib/digsig.c +++ b/lib/digsig.c @@ -163,9 +163,11 @@ static int digsig_verify_rsa(struct key *key, memcpy(out1 + head, p, l); err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len); + if (err) + goto err; - if (!err && len == hlen) - err = memcmp(out2, h, hlen); + if (len != hlen || memcmp(out2, h, hlen)) + err = -EINVAL; err: mpi_free(in); |