FAILED: patch "[PATCH] crypto: nx - Fix memcpy() over-reading in nonce" failed to apply to 5.4-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 74c66120fda6596ad57f41e1607b3a5d51ca143d Mon Sep 17 00:00:00 2001
From: Kees Cook <[email protected]>
Date: Wed, 16 Jun 2021 13:34:59 -0700
Subject: [PATCH] crypto: nx - Fix memcpy() over-reading in nonce
Fix typo in memcpy() where size should be CTR_RFC3686_NONCE_SIZE.
Fixes 030f4e968741 ("crypto: nx - Fix reentrancy bugs")
Signed-off-by Kees Cook <[email protected]>
Signed-off-by Herbert Xu <[email protected]>
drivers/crypto/nx/nx-aes-ctr.c +1 -1
@@ -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 ;