Commit 74bf81d0 authored Aug 02, 2019 by Iuliana Prodan Committed by Herbert Xu Aug 09, 2019

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>

parent ad3f0a93

crypto/gcm.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message