Commit e7c425b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fixes from Ingo Molnar:
 "Fix a couple of endianness bugs that crept in"

* tag 'objtool-urgent-2021-05-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool/x86: Fix elf_add_alternative() endianness
  objtool: Fix elf_create_undef_symbol() endianness
parents 077fc644 f66c05d6

tools/objtool/arch/x86/decode.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <objtool/elf.h>

#include <objtool/arch.h>

#include <objtool/warn.h>

#include <objtool/endianness.h>

#include <arch/elf.h>



static int is_x86_64(const struct elf *elf)
@@ -725,7 +726,7 @@ static int elf_add_alternative(struct elf *elf, 
		return -1;

	}



	alt->cpuid = cpuid;

	alt->cpuid = bswap_if_needed(cpuid);

	alt->instrlen = orig_len;

	alt->replacementlen = repl_len;

tools/objtool/elf.c

+1 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ struct symbol *elf_create_undef_symbol(struct elf *elf, const char *name) 
	data->d_buf = &sym->sym;

	data->d_size = sizeof(sym->sym);

	data->d_align = 1;

	data->d_type = ELF_T_SYM;



	sym->idx = symtab->len / sizeof(sym->sym);