Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility

The constraint "rm" allows the compiler to put mix_const into memory.
When the input operand is a memory location then MUL needs an operand
size suffix, since Clang can't infer the multiplication width from the
operand.

Add and use the _ASM_MUL macro which determines the operand size and
resolves to the NUL instruction with the corresponding suffix.

This fixes the following error when building with clang:

CC arch/x86/lib/kaslr.o
/tmp/kaslr-dfe1ad.s: Assembler messages:
/tmp/kaslr-dfe1ad.s:182: Error: no instruction mnemonic suffix given and no register operands; can't size instruction

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Cc: Grant Grundler <grundler@chromium.org>
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Davidson <md@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170501224741.133938-1-mka@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Matthias Kaehlcke and committed by
Ingo Molnar
121843eb fc5f9d5f

+3 -1
+1
arch/x86/include/asm/asm.h
··· 32 32 #define _ASM_ADD __ASM_SIZE(add) 33 33 #define _ASM_SUB __ASM_SIZE(sub) 34 34 #define _ASM_XADD __ASM_SIZE(xadd) 35 + #define _ASM_MUL __ASM_SIZE(mul) 35 36 36 37 #define _ASM_AX __ASM_REG(ax) 37 38 #define _ASM_BX __ASM_REG(bx)
+2 -1
arch/x86/lib/kaslr.c
··· 5 5 * kernel starts. This file is included in the compressed kernel and 6 6 * normally linked in the regular. 7 7 */ 8 + #include <asm/asm.h> 8 9 #include <asm/kaslr.h> 9 10 #include <asm/msr.h> 10 11 #include <asm/archrandom.h> ··· 80 79 } 81 80 82 81 /* Circular multiply for better bit diffusion */ 83 - asm("mul %3" 82 + asm(_ASM_MUL "%3" 84 83 : "=a" (random), "=d" (raw) 85 84 : "a" (random), "rm" (mix_const)); 86 85 random += raw;