crypto: octeontx2 - use crypto_memneq() to check HMAC for cipher_null authenc
Subsystems (2)
PATCH 1/1 crypto: octeontx2 - use crypto_memneq() to check HMAC for cipher_null authenc
validate_hmac_cipher_null() compares the computed and received HMAC with memcmp(), which short-circuits on the first differing byte and leaks tag-match length via timing. Use crypto_memneq() instead.
Because for cipher_null the validated payload is un-encrypted, this valid prefix leak allows for authenticated message forgery.
--- drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c +4 -3
@@ -11,6 +11,7 @@#include <crypto/xts.h> #include <crypto/gcm.h> #include <crypto/scatterwalk.h> +#include <crypto/utils.h> #include <linux/sort.h> #include <linux/module.h> #include "otx2_cptvf.h"
@@ -90,9 +91,9 @@ static inline int validate_hmac_cipher_null(struct otx2_cpt_req_info *cpt_req) req = container_of(cpt_req->areq, struct aead_request, base); tfm =crypto_aead_reqtfm (req); rctx =aead_request_ctx_dma (req); -if (memcmp (rctx->fctx.hmac.s.hmac_calc, - rctx->fctx.hmac.s.hmac_recv, -crypto_aead_authsize (tfm)) !=0 ) +if (crypto_memneq (rctx->fctx.hmac.s.hmac_calc, + rctx->fctx.hmac.s.hmac_recv, +crypto_aead_authsize (tfm)))return -EBADMSG ;return 0 ;
Signature · 1 line
2.43.0
Herbert Xu
maintainerQuoted 4 lines · David C.C.M. Gall
validate_hmac_cipher_null()compares the computed and received HMAC withmemcmp(), which short-circuits on the first differing byte and leaks tag-match length via timing. Usecrypto_memneq()instead.
Quoted 8 lines
Because for
cipher_nullthe validated payload is un-encrypted, this valid prefix leak allows for authenticated message forgery.Assisted-by gregkh_clanker_t1000Signed-off-by David C.C.M. Gall <[email protected]>--- drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt