Message ID | 1564504233-26186-1-git-send-email-iuliana.prodan@nxp.com (mailing list archive) |
---|---|
State | Changes Requested |
Delegated to: | Herbert Xu |
Headers | show |
Series | [v4] crypto: gcm - restrict assoclen for rfc4543 | expand |
On Tue, Jul 30, 2019 at 07:30:33PM +0300, Iuliana Prodan wrote: > > diff --git a/crypto/gcm.c b/crypto/gcm.c > index 2f3b50f..8adf64f 100644 > --- a/crypto/gcm.c > +++ b/crypto/gcm.c > @@ -1034,12 +1034,14 @@ static int crypto_rfc4543_copy_src_to_dst(struct aead_request *req, bool enc) > > static int crypto_rfc4543_encrypt(struct aead_request *req) > { > - return crypto_rfc4543_crypt(req, true); > + return crypto_ipsec_check_assoclen(req->assoclen) ?: > + crypto_rfc4543_crypt(req, true); Please align it like this: return crypto_ipsec_check_assoclen(req->assoclen) ?: crypto_rfc4543_crypt(req, true); as that's how everything else is aligned in crypto. Thanks,
diff --git a/crypto/gcm.c b/crypto/gcm.c index 2f3b50f..8adf64f 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -1034,12 +1034,14 @@ static int crypto_rfc4543_copy_src_to_dst(struct aead_request *req, bool enc) static int crypto_rfc4543_encrypt(struct aead_request *req) { - return crypto_rfc4543_crypt(req, true); + return crypto_ipsec_check_assoclen(req->assoclen) ?: + crypto_rfc4543_crypt(req, true); } static int crypto_rfc4543_decrypt(struct aead_request *req) { - return crypto_rfc4543_crypt(req, false); + return crypto_ipsec_check_assoclen(req->assoclen) ?: + crypto_rfc4543_crypt(req, false); } static int crypto_rfc4543_init_tfm(struct crypto_aead *tfm)