diff options
| author | Iuliana Prodan <iuliana.prodan@nxp.com> | 2019-08-02 11:47:33 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-08-09 15:11:58 +1000 |
| commit | 74bf81d0968c2262926dc2a690e671ebb768f2ec (patch) | |
| tree | 1b0c2a235dcd354b689b427653a0361cf7bcc083 /crypto | |
| parent | ad3f0a93b639c342abbe8982cc34a3370169c464 (diff) | |
| download | linux-stable-74bf81d0968c2262926dc2a690e671ebb768f2ec.tar.gz linux-stable-74bf81d0968c2262926dc2a690e671ebb768f2ec.tar.bz2 linux-stable-74bf81d0968c2262926dc2a690e671ebb768f2ec.zip | |
crypto: gcm - restrict assoclen for rfc4543
Based on seqiv, IPsec ESP and rfc4543/rfc4106 the assoclen can be 16 or
20 bytes.
From esp4/esp6, assoclen is sizeof IP Header. This includes spi, seq_no
and extended seq_no, that is 8 or 12 bytes.
In seqiv, to asscolen is added the IV size (8 bytes).
Therefore, the assoclen, for rfc4543, should be restricted to 16 or 20
bytes, as for rfc4106.
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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/gcm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index 2f3b50f8f3e0..73884208f075 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) |