Commit e37b94eb authored Dec 06, 2013 by Daniel Borkmann Committed by Herbert Xu Dec 09, 2013

crypto: memneq - fix for archs without efficient unaligned access



Commit fe8c8a12 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: fe8c8a12 ("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>

parent d1dd206c

crypto/memneq.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message