Commit 2f60f830 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_alternatives_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 alternative update from Borislav Petkov:
 "A single alternatives patching fix for modules:

   - Have alternatives patch the same sections in modules as in vmlinux"

* tag 'x86_alternatives_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/alternative: Consistently patch SMP locks in vmlinux and modules
parents 9196a0ba be84d8ed

arch/x86/kernel/module.c

+5 −6
Original line number Diff line number Diff line
@@ -251,14 +251,12 @@ int module_finalize(const Elf_Ehdr *hdr, 
		    const Elf_Shdr *sechdrs,

		    struct module *me)

{

	const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL,

	const Elf_Shdr *s, *alt = NULL, *locks = NULL,

		*para = NULL, *orc = NULL, *orc_ip = NULL,

		*retpolines = NULL, *returns = NULL, *ibt_endbr = NULL;

	char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;



	for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) {

		if (!strcmp(".text", secstrings + s->sh_name))

			text = s;

		if (!strcmp(".altinstructions", secstrings + s->sh_name))

			alt = s;

		if (!strcmp(".smp_locks", secstrings + s->sh_name))
@@ -302,12 +300,13 @@ int module_finalize(const Elf_Ehdr *hdr, 
		void *iseg = (void *)ibt_endbr->sh_addr;

		apply_ibt_endbr(iseg, iseg + ibt_endbr->sh_size);

	}

	if (locks && text) {

	if (locks) {

		void *lseg = (void *)locks->sh_addr;

		void *tseg = (void *)text->sh_addr;

		void *text = me->core_layout.base;

		void *text_end = text + me->core_layout.text_size;

		alternatives_smp_module_add(me, me->name,

					    lseg, lseg + locks->sh_size,

					    tseg, tseg + text->sh_size);

					    text, text_end);

	}



	if (orc && orc_ip)