Commit 74c66120 authored by Kees Cook's avatar Kees Cook Committed by Herbert Xu
Browse files

crypto: nx - Fix memcpy() over-reading in nonce 



Fix typo in memcpy() where size should be CTR_RFC3686_NONCE_SIZE.

Fixes: 030f4e96 ("crypto: nx - Fix reentrancy bugs")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 84c2c729

drivers/crypto/nx/nx-aes-ctr.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int ctr3686_aes_nx_crypt(struct skcipher_request *req) 
	struct nx_crypto_ctx *nx_ctx = crypto_skcipher_ctx(tfm);

	u8 iv[16];



	memcpy(iv, nx_ctx->priv.ctr.nonce, CTR_RFC3686_IV_SIZE);

	memcpy(iv, nx_ctx->priv.ctr.nonce, CTR_RFC3686_NONCE_SIZE);

	memcpy(iv + CTR_RFC3686_NONCE_SIZE, req->iv, CTR_RFC3686_IV_SIZE);

	iv[12] = iv[13] = iv[14] = 0;

	iv[15] = 1;