[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100107211618.GA20258@Chamillionaire.breakpoint.cc>
Date: Thu, 7 Jan 2010 22:16:18 +0100
From: Sebastian Andrzej Siewior <sebastian@...akpoint.cc>
To: Herbert Xu <herbert@...dor.apana.org.au>
Cc: Sebastian Andrzej Siewior <sebastian@...akpoint.cc>,
Roel Kluin <roel.kluin@...il.com>,
"David S. Miller" <davem@...emloft.net>,
linux-crypto@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
Sergey Mironov <ierton@...il.com>,
Martin Schwidefsky <schwidefsky@...ibm.com>
Subject: [PATCH 1/2] crypto/s390_aes: access .cip instead of .blk in cipher
mode
>From aff6860829e06f8f7ba5f4a8160a6612e1a6eca7 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@...il.com>
Date: Thu, 7 Jan 2010 21:55:50 +0100
The fallback code in cipher mode touch the union fallback.blk instead
of fallback.cip. This is wrong because we use the cipher and not the
blockcipher. This did not show any side effects yet because both types /
structs contain the same element right now.
[bigeasy@...akpoint: different commit message, split the patch in two and
rebase ]
Signed-off-by: Roel Kluin <roel.kluin@...il.com>
Signed-off-by: Sebastian Andrzej Siewior <sebastian@...akpoint.cc>
---
arch/s390/crypto/aes_s390.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 6be4503..58f4673 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -78,14 +78,14 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key,
struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
int ret;
- sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
- sctx->fallback.blk->base.crt_flags |= (tfm->crt_flags &
+ sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
+ sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &
CRYPTO_TFM_REQ_MASK);
ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);
if (ret) {
tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
- tfm->crt_flags |= (sctx->fallback.blk->base.crt_flags &
+ tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags &
CRYPTO_TFM_RES_MASK);
}
return ret;
--
1.6.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists