]> Pileus Git - ~andy/linux/commitdiff
crypto: memneq - fix for archs without efficient unaligned access
authorDaniel Borkmann <dborkman@redhat.com>
Thu, 5 Dec 2013 23:33:33 +0000 (00:33 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 9 Dec 2013 12:09:12 +0000 (20:09 +0800)
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")
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-By: Cesar Eduardo Barros <cesarb@cesarb.eti.br>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/memneq.c

index 570f6f3401cedbd41aa10f1a8fa33304fbfc0ff1..afed1bd16aee0b53f63a4bdc11aecab56927821d 100644 (file)
@@ -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);