diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-12-06 00:33:33 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-12-09 20:09:12 +0800 |
| commit | e37b94ebffdd93d121e5308eb93e2e55a0893fbb (patch) | |
| tree | b4766180285e47231c602c403c5002d19e2adda6 /crypto/memneq.c | |
| parent | d1dd206c2abf678889445e63ecc949e9274f5806 (diff) | |
| download | linux-e37b94ebffdd93d121e5308eb93e2e55a0893fbb.tar.gz linux-e37b94ebffdd93d121e5308eb93e2e55a0893fbb.tar.bz2 linux-e37b94ebffdd93d121e5308eb93e2e55a0893fbb.zip | |
crypto: memneq - fix for archs without efficient unaligned access
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>
Diffstat (limited to 'crypto/memneq.c')
| -rw-r--r-- | crypto/memneq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/memneq.c b/crypto/memneq.c index 570f6f3401ce..afed1bd16aee 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); |