Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dde0c15 authored by Guixiong Wei's avatar Guixiong Wei Committed by Greg Kroah-Hartman
Browse files

x86/boot: Ignore relocations in .notes sections in walk_relocs() too 



[ Upstream commit 76e9762d66373354b45c33b60e9a53ef2a3c5ff2 ]

Commit:

  aaa8736370db ("x86, relocs: Ignore relocations in .notes section")

... only started ignoring the .notes sections in print_absolute_relocs(),
but the same logic should also by applied in walk_relocs() to avoid
such relocations.

[ mingo: Fixed various typos in the changelog, removed extra curly braces from the code. ]

Fixes: aaa8736370db ("x86, relocs: Ignore relocations in .notes section")
Fixes: 5ead97c8 ("xen: Core Xen implementation")
Fixes: da1a679c ("Add /sys/kernel/notes")
Signed-off-by: default avatarGuixiong Wei <weiguixiong@bytedance.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20240317150547.24910-1-weiguixiong@bytedance.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a50b7aae

arch/x86/tools/relocs.c

+9 −0
Original line number Diff line number Diff line
@@ -689,6 +689,15 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel, 
		if (!(sec_applies->shdr.sh_flags & SHF_ALLOC)) {

			continue;

		}



		/*

		 * Do not perform relocations in .notes sections; any

		 * values there are meant for pre-boot consumption (e.g.

		 * startup_xen).

		 */

		if (sec_applies->shdr.sh_type == SHT_NOTE)

			continue;



		sh_symtab = sec_symtab->symtab;

		sym_strtab = sec_symtab->link->strtab;

		for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {