[PATCH cryptodev] crypto: memneq: fix for archs without efficient unaligned access

[PATCH cryptodev] crypto: memneq: fix for archs without efficient unaligned access

[Daniel Borkmann]

Commit fe8c8a126806 introduced a possible build error for archs
that do not have CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS set. :/
Fix this up by bringing else braces outside of the ifdef.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Fixes: fe8c8a126806 ("crypto: more robust crypto_memneq")
Cc: Cesar Eduardo Barros <cesarb@cesarb.eti.br>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 Sending stand-alone fix as original patch is already applied.

 crypto/memneq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/memneq.c b/crypto/memneq.c
index 570f6f3..afed1bd 100644
--- a/crypto/memneq.c
+++ b/crypto/memneq.c
@@ -108,8 +108,9 @@ static inline unsigned long __crypto_memneq_16(const void *a, const void *b)
 		OPTIMIZER_HIDE_VAR(neq);
 		neq |= *(unsigned int *)(a+12) ^ *(unsigned int *)(b+12);
 		OPTIMIZER_HIDE_VAR(neq);
-	} else {
+	} else
 #endif /* CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS */
+	{
 		neq |= *(unsigned char *)(a)    ^ *(unsigned char *)(b);
 		OPTIMIZER_HIDE_VAR(neq);
 		neq |= *(unsigned char *)(a+1)  ^ *(unsigned char *)(b+1);
-- 
1.8.3.1

Re: [PATCH cryptodev] crypto: memneq: fix for archs without efficient unaligned access

[Herbert Xu]

On Fri, Dec 06, 2013 at 12:33:33AM +0100, Daniel Borkmann wrote:
> Commit fe8c8a126806 introduced a possible build error for archs
> that do not have CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS set. :/
> Fix this up by bringing else braces outside of the ifdef.
> 
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Fixes: fe8c8a126806 ("crypto: more robust crypto_memneq")
> Cc: Cesar Eduardo Barros <cesarb@cesarb.eti.br>
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

Patch applied.  Thanks!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt