Patch "crypto: nx - Fix reentrancy bugs" has been added to the 4.1-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
crypto: nx - Fix reentrancy bugs
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
crypto-nx-fix-reentrancy-bugs.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
030f4e968741d65aea9cd5f7814d1164967801efMon Sep 17 00:00:00 2001
From: Herbert Xu <[email protected]>
Date: Tue, 7 Jul 2015 17:30:25 +0800
Subject: crypto: nx - Fix reentrancy bugs
From: Herbert Xu <[email protected]>
commit 030f4e968741d65aea9cd5f7814d1164967801ef upstream.
This patch fixes a host of reentrancy bugs in the nx driver. The following algorithms are affected:
* CCM
* GCM
* CTR
* XCBC
* SHA256
* SHA512
The crypto API allows a single transform to be used by multiple threads simultaneously. For example, IPsec will use a single tfm to process packets for a given SA. As packets may arrive on multiple CPUs that tfm must be reentrant.
The nx driver does try to deal with this by using a spin lock. Unfortunately only the basic AES/CBC/ECB algorithms do this in the correct way.
The symptom of these bugs may range from the generation of incorrect output to memory corruption.
--- drivers/crypto/nx/nx-aes-ccm.c | 6 ++- drivers/crypto/nx/nx-aes-ctr.c | 7 ++-- drivers/crypto/nx/nx-aes-gcm.c | 17 +++++---- drivers/crypto/nx/nx-aes-xcbc.c | 70 +++++++++++++++++++++++++--------------- drivers/crypto/nx/nx-sha256.c | 43 +++++++++++++----------- drivers/crypto/nx/nx-sha512.c | 44 ++++++++++++++----------- drivers/crypto/nx/nx.c | 2 + drivers/crypto/nx/nx.h | 14 ++++++-- 8 files changed, 124 insertions(+), 79 deletions(-)
drivers/crypto/nx/nx-aes-ccm.c +4 -2
@@ -494,8 +494,9 @@ out:static int ccm4309_aes_nx_encrypt (struct aead_request *req) {struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); +struct nx_gcm_rctx *rctx =aead_request_ctx (req);struct blkcipher_desc desc; -u8 *iv = nx_ctx->priv.ccm.iv; +u8 *iv = rctx->iv; iv[0 ] =3 ;memcpy (iv +1 , nx_ctx->priv.ccm.nonce,3 );
@@ -525,8 +526,9 @@ static int ccm_aes_nx_encrypt(struct aeastatic int ccm4309_aes_nx_decrypt (struct aead_request *req) {struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); +struct nx_gcm_rctx *rctx =aead_request_ctx (req);struct blkcipher_desc desc; -u8 *iv = nx_ctx->priv.ccm.iv; +u8 *iv = rctx->iv; iv[0 ] =3 ;memcpy (iv +1 , nx_ctx->priv.ccm.nonce,3 );
drivers/crypto/nx/nx-aes-ctr.c +4 -3
@@ -72,7 +72,7 @@ static int ctr3686_aes_nx_set_key(structif (key_len <CTR_RFC3686_NONCE_SIZE )return -EINVAL ; -memcpy (nx_ctx->priv.ctr.iv, +memcpy (nx_ctx->priv.ctr.nonce, in_key + key_len -CTR_RFC3686_NONCE_SIZE ,CTR_RFC3686_NONCE_SIZE );
@@ -131,14 +131,15 @@ static int ctr3686_aes_nx_crypt(struct b unsigned int nbytes) {struct nx_crypto_ctx *nx_ctx =crypto_blkcipher_ctx (desc->tfm); -u8 *iv = nx_ctx->priv.ctr.iv; +u8 iv[16 ]; +memcpy (iv, nx_ctx->priv.ctr.nonce,CTR_RFC3686_IV_SIZE );memcpy (iv +CTR_RFC3686_NONCE_SIZE , desc->info,CTR_RFC3686_IV_SIZE ); iv[12 ] = iv[13 ] = iv[14 ] =0 ; iv[15 ] =1 ; - desc->info = nx_ctx->priv.ctr.iv; + desc->info = iv;return ctr_aes_nx_crypt (desc, dst, src, nbytes); }
drivers/crypto/nx/nx-aes-gcm.c +10 -7
@@ -330,6 +330,7 @@ out:static int gcm_aes_nx_crypt (struct aead_request *req,int enc) {struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); +struct nx_gcm_rctx *rctx =aead_request_ctx (req);struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;struct blkcipher_desc desc;unsigned int nbytes = req->cryptlen;
@@ -339,7 +340,7 @@ static int gcm_aes_nx_crypt(struct aead_spin_lock_irqsave (&nx_ctx->lock, irq_flags); - desc.info = nx_ctx->priv.gcm.iv; + desc.info = rctx->iv;/* initialize the counter */ *(u32 *)(desc.info +NX_GCM_CTR_OFFSET ) =1 ;
@@ -434,8 +435,8 @@ out:static int gcm_aes_nx_encrypt (struct aead_request *req) { -struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); -char *iv = nx_ctx->priv.gcm.iv; +struct nx_gcm_rctx *rctx =aead_request_ctx (req); +char *iv = rctx->iv;memcpy (iv, req->iv,12 );
@@ -444,8 +445,8 @@ static int gcm_aes_nx_encrypt(struct aeastatic int gcm_aes_nx_decrypt (struct aead_request *req) { -struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); -char *iv = nx_ctx->priv.gcm.iv; +struct nx_gcm_rctx *rctx =aead_request_ctx (req); +char *iv = rctx->iv;memcpy (iv, req->iv,12 );
@@ -455,7 +456,8 @@ static int gcm_aes_nx_decrypt(struct aeastatic int gcm4106_aes_nx_encrypt (struct aead_request *req) {struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); -char *iv = nx_ctx->priv.gcm.iv; +struct nx_gcm_rctx *rctx =aead_request_ctx (req); +char *iv = rctx->iv;char *nonce = nx_ctx->priv.gcm.nonce;memcpy (iv, nonce,NX_GCM4106_NONCE_LEN );
@@ -467,7 +469,8 @@ static int gcm4106_aes_nx_encrypt(structstatic int gcm4106_aes_nx_decrypt (struct aead_request *req) {struct nx_crypto_ctx *nx_ctx =crypto_tfm_ctx (req->base.tfm); -char *iv = nx_ctx->priv.gcm.iv; +struct nx_gcm_rctx *rctx =aead_request_ctx (req); +char *iv = rctx->iv;char *nonce = nx_ctx->priv.gcm.nonce;memcpy (iv, nonce,NX_GCM4106_NONCE_LEN );
drivers/crypto/nx/nx-aes-xcbc.c +44 -26
139 lines not on this page · raw message
drivers/crypto/nx/nx-sha256.c +24 -19
77 lines not on this page · raw message
drivers/crypto/nx/nx-sha512.c +25 -19
78 lines not on this page · raw message
drivers/crypto/nx/nx.c +2 -0
@@ -635,12 +635,14 @@ static int nx_crypto_ctx_init(struct nx_/* entry points from the crypto tfm initializers */ int nx_crypto_ctx_aes_ccm_init (struct crypto_tfm *tfm) { + tfm->crt_aead.reqsize =sizeof (struct nx_ccm_rctx );return nx_crypto_ctx_init (crypto_tfm_ctx (tfm),NX_FC_AES ,NX_MODE_AES_CCM ); }int nx_crypto_ctx_aes_gcm_init (struct crypto_tfm *tfm) { + tfm->crt_aead.reqsize =sizeof (struct nx_gcm_rctx );return nx_crypto_ctx_init (crypto_tfm_ctx (tfm),NX_FC_AES ,NX_MODE_AES_GCM ); }
drivers/crypto/nx/nx.h +11 -3
@@ -2,6 +2,8 @@#ifndef __NX_H__#define __NX_H__ +#include <crypto/ctr.h> +#define NX_NAME "nx-crypto"#define NX_STRING "IBM Power7+ Nest Accelerator Crypto Driver"#define NX_VERSION "1.0"
@@ -91,8 +93,11 @@ struct nx_crypto_driver {#define NX_GCM4106_NONCE_LEN (4)#define NX_GCM_CTR_OFFSET (12) -struct nx_gcm_priv { +struct nx_gcm_rctx {u8 iv[16 ]; +}; + +struct nx_gcm_priv {u8 iauth_tag[16 ];u8 nonce[NX_GCM4106_NONCE_LEN ]; };
@@ -100,8 +105,11 @@ struct nx_gcm_priv {#define NX_CCM_AES_KEY_LEN (16)#define NX_CCM4309_AES_KEY_LEN (19)#define NX_CCM4309_NONCE_LEN (3) -struct nx_ccm_priv { +struct nx_ccm_rctx {u8 iv[16 ]; +}; + +struct nx_ccm_priv {u8 b0[16 ];u8 iauth_tag[16 ];u8 oauth_tag[16 ];
@@ -113,7 +121,7 @@ struct nx_xcbc_priv { };struct nx_ctr_priv { -u8 iv[16 ]; +u8 nonce[CTR_RFC3686_NONCE_SIZE ]; };struct nx_crypto_ctx {
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/crypto-nx-fix-reentrancy-bugs.patch queue-4.1/crypto-nx-fixing-nx-data-alignment-with-nx_sg-list.patch queue-4.1/crypto-nx-fixing-sha-update-bug.patch