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

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fixes from Thomas Gleixner:
"Three fixlets for objtool:

- Address two segfaults related to missing parameter and clang
objects

- Make it compile clean with clang"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Fix seg fault with clang-compiled objects
objtool: Fix seg fault caused by missing parameter
objtool: Fix Clang enum conversion warning

Linus Torvalds 31336ed9 8371e5a0

+6 -2
unified split
+1 -1
tools/objtool/arch/x86/decode.c
··· 138 138 *type = INSN_STACK; 139 139 op->src.type = OP_SRC_ADD; 140 140 op->src.reg = op_to_cfi_reg[modrm_reg][rex_r]; 141 - op->dest.type = OP_SRC_REG; 141 + op->dest.type = OP_DEST_REG; 142 142 op->dest.reg = CFI_SP; 143 143 } 144 144 break;
+3 -1
tools/objtool/builtin-orc.c
··· 44 44 const char *objname; 45 45 46 46 argc--; argv++; 47 + if (argc <= 0) 48 + usage_with_options(orc_usage, check_options); 49 + 47 50 if (!strncmp(argv[0], "gen", 3)) { 48 51 argc = parse_options(argc, argv, check_options, orc_usage, 0); 49 52 if (argc != 1) ··· 55 52 objname = argv[0]; 56 53 57 54 return check(objname, no_fp, no_unreachable, true); 58 - 59 55 } 60 56 61 57 if (!strcmp(argv[0], "dump")) {
+2
tools/objtool/orc_gen.c
··· 165 165 166 166 /* create .orc_unwind_ip and .rela.orc_unwind_ip sections */ 167 167 sec = elf_create_section(file->elf, ".orc_unwind_ip", sizeof(int), idx); 168 + if (!sec) 169 + return -1; 168 170 169 171 ip_relasec = elf_create_rela_section(file->elf, sec); 170 172 if (!ip_relasec)