From 8494a5a60fed5a00bdaaf53a674a165bc882f923 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 28 Jun 2012 17:26:02 +0200 Subject: [PATCH] --- yaml --- r: 318383 b: refs/heads/master c: bf084d8f6eb4ded3f90a6ab79bb682db00ebfbd4 h: refs/heads/master i: 318381: f8dcc9e6f507be55871f36dc2b20b4b086ef91e2 318379: 856fda5267ecd7864993595d6ad645b1510acc8f 318375: 2c4918973f7da4990abb75eac8cfede37b053305 318367: 3e7726c166e2d4ef37e09dbce4ad506e975f6f13 v: v3 --- [refs] | 2 +- trunk/arch/x86/crypto/aesni-intel_glue.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cad3109d9448..e53d132696b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82c2f9607b8a4667e9d89613478748f4e2b7288b +refs/heads/master: bf084d8f6eb4ded3f90a6ab79bb682db00ebfbd4 diff --git a/trunk/arch/x86/crypto/aesni-intel_glue.c b/trunk/arch/x86/crypto/aesni-intel_glue.c index d6626152067d..34fdcff4d2c8 100644 --- a/trunk/arch/x86/crypto/aesni-intel_glue.c +++ b/trunk/arch/x86/crypto/aesni-intel_glue.c @@ -529,7 +529,7 @@ static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key, struct crypto_aead *cryptd_child = cryptd_aead_child(ctx->cryptd_tfm); struct aesni_rfc4106_gcm_ctx *child_ctx = aesni_rfc4106_gcm_ctx_get(cryptd_child); - u8 *new_key_mem = NULL; + u8 *new_key_align, *new_key_mem = NULL; if (key_len < 4) { crypto_tfm_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); @@ -553,9 +553,9 @@ static int rfc4106_set_key(struct crypto_aead *parent, const u8 *key, if (!new_key_mem) return -ENOMEM; - new_key_mem = PTR_ALIGN(new_key_mem, AESNI_ALIGN); - memcpy(new_key_mem, key, key_len); - key = new_key_mem; + new_key_align = PTR_ALIGN(new_key_mem, AESNI_ALIGN); + memcpy(new_key_align, key, key_len); + key = new_key_align; } if (!irq_fpu_usable())