diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 14:54:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 14:54:24 -0800 |
| commit | 2f60f830842d6c6960a0c038695f7bb4f0ef896d (patch) | |
| tree | 3f663c69515663b1bd41a86fea515c714fd99a4a /arch | |
| parent | 9196a0ba9f0ebe168c7b186f63cf7cab02e55778 (diff) | |
| parent | be84d8ed3f04e9154a3a55e29a27dcd416f05b31 (diff) | |
| download | linux-stable-2f60f830842d6c6960a0c038695f7bb4f0ef896d.tar.gz linux-stable-2f60f830842d6c6960a0c038695f7bb4f0ef896d.tar.bz2 linux-stable-2f60f830842d6c6960a0c038695f7bb4f0ef896d.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/module.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index c032edcd3d95..c8a25aed604d 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c @@ -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) |