From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
To: linux-kernel@vger.kernel.org
Cc: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au, akpm@osdl.org
Subject: Re: [PATCH] crypto: fix unaligned access in khazad module
Date: Tue, 04 Apr 2006 00:05:18 +0900 (JST) [thread overview]
Message-ID: <20060404.000518.126141927.anemo@mba.ocn.ne.jp> (raw)
In-Reply-To: <20060309.122638.07642914.nemoto@toshiba-tops.co.jp>
Ping. This patch can be applied cleanly to 2.6.17-rc1.
On 64-bit platform, reading directly from keys (which supposed to be
32-bit aligned) will result in unaligned access.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
diff --git a/crypto/khazad.c b/crypto/khazad.c
index 807f2bf..c7e1d25 100644
--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@@ -26,6 +26,7 @@
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/types.h>
+#include <asm/unaligned.h>
#define KHAZAD_KEY_SIZE 16
#define KHAZAD_BLOCK_SIZE 8
@@ -769,8 +770,8 @@ static int khazad_setkey(void *ctx_arg,
return -EINVAL;
}
- K2 = be64_to_cpu(key[0]);
- K1 = be64_to_cpu(key[1]);
+ K2 = be64_to_cpu(get_unaligned(&key[0]));
+ K1 = be64_to_cpu(get_unaligned(&key[1]));
/* setup the encrypt key */
for (r = 0; r <= KHAZAD_ROUNDS; r++) {
next prev parent reply other threads:[~2006-04-03 15:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-09 3:26 Atsushi Nemoto
2006-03-09 22:10 ` Herbert Xu
2006-04-03 15:05 ` Atsushi Nemoto [this message]
2006-04-03 23:11 ` Herbert Xu
2006-04-04 7:55 ` Atsushi Nemoto
2006-04-05 17:29 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060404.000518.126141927.anemo@mba.ocn.ne.jp \
--to=anemo@mba.ocn.ne.jp \
--cc=akpm@osdl.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®