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

Commit 5f489579 authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Greg Kroah-Hartman
Browse files

powerpc64/module elfv1: Set opd addresses after module relocation 



commit 59fe7eaf3598a89cbcd72e645b1d08afd76f7b29 upstream.

module_frob_arch_sections() is called before the module is moved to its
final location. The function descriptor section addresses we are setting
here are thus invalid. Fix this by processing opd section during
module_finalize()

Fixes: 5633e85b ("powerpc64: Add .opd based function descriptor dereference")
Cc: stable@vger.kernel.org # v4.16
Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 778af261

arch/powerpc/kernel/module.c

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ int module_finalize(const Elf_Ehdr *hdr, 
				  (void *)sect->sh_addr + sect->sh_size);

#endif /* CONFIG_PPC64 */



#ifdef PPC64_ELF_ABI_v1

	sect = find_section(hdr, sechdrs, ".opd");

	if (sect != NULL) {

		me->arch.start_opd = sect->sh_addr;

		me->arch.end_opd = sect->sh_addr + sect->sh_size;

	}

#endif /* PPC64_ELF_ABI_v1 */



#ifdef CONFIG_PPC_BARRIER_NOSPEC

	sect = find_section(hdr, sechdrs, "__spec_barrier_fixup");

	if (sect != NULL)

arch/powerpc/kernel/module_64.c

+0 −5
Original line number Diff line number Diff line
@@ -360,11 +360,6 @@ int module_frob_arch_sections(Elf64_Ehdr *hdr, 
		else if (strcmp(secstrings+sechdrs[i].sh_name,"__versions")==0)

			dedotify_versions((void *)hdr + sechdrs[i].sh_offset,

					  sechdrs[i].sh_size);

		else if (!strcmp(secstrings + sechdrs[i].sh_name, ".opd")) {

			me->arch.start_opd = sechdrs[i].sh_addr;

			me->arch.end_opd = sechdrs[i].sh_addr +

					   sechdrs[i].sh_size;

		}



		/* We don't handle .init for the moment: rename to _init */

		while ((p = strstr(secstrings + sechdrs[i].sh_name, ".init")))