p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: caam - check assoclen 

Check assoclen to solve the extra tests that expect -EINVAL to be
returned when the associated data size is not valid.

Validated assoclen for RFC4106 and RFC4543 which expects an assoclen
of 16 or 20.
Based on seqiv, IPsec ESP and RFC4543/RFC4106 the assoclen is sizeof IP
Header (spi, seq_no, extended seq_no) and IV len. This can be 16 or 20
bytes.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Iuliana Prodan 2019-07-31 16:08:07 +03:00 committed by Herbert Xu
parent 68a51394f3
commit fcd23ed57c
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/crypto/caam/caamalg.c
View File

@ -1598,10 +1598,7 @@ static int chachapoly_decrypt(struct aead_request *req)
static int ipsec_gcm_encrypt(struct aead_request *req) static int ipsec_gcm_encrypt(struct aead_request *req)
{ {
if (req->assoclen < 8) return crypto_ipsec_check_assoclen(req->assoclen) ? : gcm_encrypt(req);
return -EINVAL;
return gcm_encrypt(req);
} }
static int aead_encrypt(struct aead_request *req) static int aead_encrypt(struct aead_request *req)
@ -1675,10 +1672,7 @@ static int gcm_decrypt(struct aead_request *req)
static int ipsec_gcm_decrypt(struct aead_request *req) static int ipsec_gcm_decrypt(struct aead_request *req)
{ {
if (req->assoclen < 8) return crypto_ipsec_check_assoclen(req->assoclen) ? : gcm_decrypt(req);
return -EINVAL;
return gcm_decrypt(req);
} }
static int aead_decrypt(struct aead_request *req) static int aead_decrypt(struct aead_request *req)

12
drivers/crypto/caam/caamalg_qi.c
View File

@ -1237,18 +1237,14 @@ static int aead_decrypt(struct aead_request *req)
static int ipsec_gcm_encrypt(struct aead_request *req) static int ipsec_gcm_encrypt(struct aead_request *req)
{ {
if (req->assoclen < 8) return crypto_ipsec_check_assoclen(req->assoclen) ? : aead_crypt(req,
return -EINVAL; true);
return aead_crypt(req, true);
} }
static int ipsec_gcm_decrypt(struct aead_request *req) static int ipsec_gcm_decrypt(struct aead_request *req)
{ {
if (req->assoclen < 8) return crypto_ipsec_check_assoclen(req->assoclen) ? : aead_crypt(req,
return -EINVAL; false);
return aead_crypt(req, false);
} }
static void skcipher_done(struct caam_drv_req *drv_req, u32 status) static void skcipher_done(struct caam_drv_req *drv_req, u32 status)

10
drivers/crypto/caam/caamalg_qi2.c
View File

@ -1407,18 +1407,12 @@ static int aead_decrypt(struct aead_request *req)
static int ipsec_gcm_encrypt(struct aead_request *req) static int ipsec_gcm_encrypt(struct aead_request *req)
{ {
if (req->assoclen < 8) return crypto_ipsec_check_assoclen(req->assoclen) ? : aead_encrypt(req);
return -EINVAL;
return aead_encrypt(req);
} }
static int ipsec_gcm_decrypt(struct aead_request *req) static int ipsec_gcm_decrypt(struct aead_request *req)
{ {
if (req->assoclen < 8) return crypto_ipsec_check_assoclen(req->assoclen) ? : aead_decrypt(req);
return -EINVAL;
return aead_decrypt(req);
} }
static void skcipher_encrypt_done(void *cbk_ctx, u32 status) static void skcipher_encrypt_done(void *cbk_ctx, u32 status)