aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/crypto.h
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2015-01-05 12:21:45 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2015-01-08 21:46:18 +1100
commit15acabfd02e35e270360fbe0def898e48754b3d6 (patch)
tree7d510d2073d5504d17bed2b9038057f16bf2f97b /include/linux/crypto.h
parentcrypto: omap-des - fix BUG_ON condition (diff)
downloadlinux-dev-15acabfd02e35e270360fbe0def898e48754b3d6.tar.xz
linux-dev-15acabfd02e35e270360fbe0def898e48754b3d6.zip
crypto: aead - add check for presence of auth tag
The AEAD decryption operation requires the authentication tag to be present as part of the cipher text buffer. The added check verifies that the caller provides a cipher text with at least the authentication tag. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/linux/crypto.h')
-rw-r--r--include/linux/crypto.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 9c8776d0ada8..90998348e564 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -1412,6 +1412,9 @@ static inline int crypto_aead_encrypt(struct aead_request *req)
*/
static inline int crypto_aead_decrypt(struct aead_request *req)
{
+ if (req->cryptlen < crypto_aead_authsize(crypto_aead_reqtfm(req)))
+ return -EINVAL;
+
return crypto_aead_crt(crypto_aead_reqtfm(req))->decrypt(req);
}