crypto: geode-aes - Fix cip/blk confusion

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Friday, February 26, 2010 - 6:59 pm

Gitweb:     http://git.kernel.org/linus/e054f1647162d7098a9ff619405a72bd7c417213
Commit:     e054f1647162d7098a9ff619405a72bd7c417213
Parent:     7d6f75eb21b84cdc5dfb09789974f02b42a89058
Author:     Roel Kluin <roel.kluin@gmail.com>
AuthorDate: Thu Feb 4 11:39:13 2010 +1100
Committer:  Herbert Xu <herbert@gondor.apana.org.au>
CommitDate: Thu Feb 4 11:39:13 2010 +1100

    crypto: geode-aes - Fix cip/blk confusion
    
    a crypto_cipher cip member was set where a crypto_cipher blk members
    should have been.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
 drivers/crypto/geode-aes.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 03e71b1..c7a5a43 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -141,7 +141,7 @@ static int geode_setkey_cip(struct crypto_tfm *tfm, const u8 *key,
 	ret = crypto_cipher_setkey(op->fallback.cip, key, len);
 	if (ret) {
 		tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
-		tfm->crt_flags |= (op->fallback.blk->base.crt_flags & CRYPTO_TFM_RES_MASK);
+		tfm->crt_flags |= (op->fallback.cip->base.crt_flags & CRYPTO_TFM_RES_MASK);
 	}
 	return ret;
 }
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
crypto: geode-aes - Fix cip/blk confusion, Linux Kernel Mailing ..., (Fri Feb 26, 6:59 pm)