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

objtool: Fix '-mtune=atom' decoding support in objtool 2.0

With '-mtune=atom', which is enabled with CONFIG_MATOM=y, GCC uses some
unusual instructions for setting up the stack.

Instead of:

mov %rsp, %rbp

it does:

lea (%rsp), %rbp

And instead of:

add imm, %rsp

it does:

lea disp(%rsp), %rsp

Add support for these instructions to the objtool decoder.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: baa41469a7b9 ("objtool: Implement stack validation 2.0")
Link: http://lkml.kernel.org/r/4ea1db896e821226efe1f8e09f270771bde47e65.1501188854.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Josh Poimboeuf and committed by
Ingo Molnar
5b8de48e 0e2bb2bc

+25 -1
+25 -1
tools/objtool/arch/x86/decode.c
··· 271 271 case 0x8d: 272 272 if (rex == 0x48 && modrm == 0x65) { 273 273 274 - /* lea -disp(%rbp), %rsp */ 274 + /* lea disp(%rbp), %rsp */ 275 275 *type = INSN_STACK; 276 276 op->src.type = OP_SRC_ADD; 277 277 op->src.reg = CFI_BP; 278 278 op->src.offset = insn.displacement.value; 279 279 op->dest.type = OP_DEST_REG; 280 280 op->dest.reg = CFI_SP; 281 + break; 282 + } 283 + 284 + if (rex == 0x48 && (modrm == 0xa4 || modrm == 0x64) && 285 + sib == 0x24) { 286 + 287 + /* lea disp(%rsp), %rsp */ 288 + *type = INSN_STACK; 289 + op->src.type = OP_SRC_ADD; 290 + op->src.reg = CFI_SP; 291 + op->src.offset = insn.displacement.value; 292 + op->dest.type = OP_DEST_REG; 293 + op->dest.reg = CFI_SP; 294 + break; 295 + } 296 + 297 + if (rex == 0x48 && modrm == 0x2c && sib == 0x24) { 298 + 299 + /* lea (%rsp), %rbp */ 300 + *type = INSN_STACK; 301 + op->src.type = OP_SRC_REG; 302 + op->src.reg = CFI_SP; 303 + op->dest.type = OP_DEST_REG; 304 + op->dest.reg = CFI_BP; 281 305 break; 282 306 } 283 307