diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 16:48:22 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 16:48:22 -0800 |
| commit | 45b4539309d82ae04e6ed7de494ae194ca0755aa (patch) | |
| tree | 2ee6f8118fbce7cf8dafbb3ebd2baf69c065769d /crypto/gcm.c | |
| parent | 44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
| download | kernel_replicant_linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.gz kernel_replicant_linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.bz2 kernel_replicant_linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.zip | |
Merge 3.13-rc2 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/gcm.c')
| -rw-r--r-- | crypto/gcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index 43e1fb05ea54..b4f017939004 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -582,7 +582,7 @@ static int crypto_gcm_verify(struct aead_request *req, crypto_xor(auth_tag, iauth_tag, 16); scatterwalk_map_and_copy(iauth_tag, req->src, cryptlen, authsize, 0); - return memcmp(iauth_tag, auth_tag, authsize) ? -EBADMSG : 0; + return crypto_memneq(iauth_tag, auth_tag, authsize) ? -EBADMSG : 0; } static void gcm_decrypt_done(struct crypto_async_request *areq, int err) |