* [PATCH cryptodev] crypto: memneq: fix for archs without efficient unaligned access
@ 2013-12-05 23:33 Daniel Borkmann
2013-12-09 12:10 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Borkmann @ 2013-12-05 23:33 UTC (permalink / raw)
To: herbert; +Cc: linux-crypto, Cesar Eduardo Barros
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-09 12:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-05 23:33 [PATCH cryptodev] crypto: memneq: fix for archs without efficient unaligned access Daniel Borkmann
2013-12-09 12:10 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox