[POWERPC] Fix timekeeping on PowerPC 601

[safe/jmp/linux-2.6] / crypto / ablkcipher.c

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index d45fa16..3dbb1cc 100644 (file)
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -35,7 +35,7 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsign
        alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
        memcpy(alignbuffer, key, keylen);
        ret = cipher->setkey(tfm, alignbuffer, keylen);
-       memset(alignbuffer, 0, absize);
+       memset(alignbuffer, 0, keylen);
        kfree(buffer);
        return ret;
 }
@@ -91,8 +91,10 @@ static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)
        seq_printf(m, "min keysize  : %u\n", ablkcipher->min_keysize);
        seq_printf(m, "max keysize  : %u\n", ablkcipher->max_keysize);
        seq_printf(m, "ivsize       : %u\n", ablkcipher->ivsize);
-       seq_printf(m, "qlen         : %u\n", ablkcipher->queue->qlen);
-       seq_printf(m, "max qlen     : %u\n", ablkcipher->queue->max_qlen);
+       if (ablkcipher->queue) {
+               seq_printf(m, "qlen         : %u\n", ablkcipher->queue->qlen);
+               seq_printf(m, "max qlen     : %u\n", ablkcipher->queue->max_qlen);
+       }
 }
 
 const struct crypto_type crypto_ablkcipher_type = {