This is a note to let you know that I've just added the patch titled
ARM: module: Use module_init_layout_section() to spot init sections
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-module-use-module_init_layout_section-to-spot-init-sections.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a6846234f45801441f0e31a8b37f901ef0abd2df Mon Sep 17 00:00:00 2001
From: James Morse <james.morse@xxxxxxx>
Date: Tue, 1 Aug 2023 14:54:09 +0000
Subject: ARM: module: Use module_init_layout_section() to spot init sections
From: James Morse <james.morse@xxxxxxx>
commit a6846234f45801441f0e31a8b37f901ef0abd2df upstream.
Today module_frob_arch_sections() spots init sections from their
'init' prefix, and uses this to keep the init PLTs separate from the rest.
get_module_plt() uses within_module_init() to determine if a
location is in the init text or not, but this depends on whether
core code thought this was an init section.
Naturally the logic is different.
module_init_layout_section() groups the init and exit text together if
module unloading is disabled, as the exit code will never run. The result
is kernels with this configuration can't load all their modules because
there are not enough PLTs for the combined init+exit section.
A previous patch exposed module_init_layout_section(), use that so the
logic is the same.
Fixes: 055f23b74b20 ("module: check for exit sections in layout_sections() instead of module_init_section()")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: James Morse <james.morse@xxxxxxx>
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/kernel/module-plts.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/kernel/module-plts.c
+++ b/arch/arm/kernel/module-plts.c
@@ -256,7 +256,7 @@ int module_frob_arch_sections(Elf_Ehdr *
/* sort by type and symbol index */
sort(rels, numrels, sizeof(Elf32_Rel), cmp_rel, NULL);
- if (strncmp(secstrings + dstsec->sh_name, ".init", 5) != 0)
+ if (!module_init_layout_section(secstrings + dstsec->sh_name))
core_plts += count_plts(syms, dstsec->sh_addr, rels,
numrels, s->sh_info);
else
Patches currently in stable-queue which might be from james.morse@xxxxxxx are
queue-6.1/arm-module-use-module_init_layout_section-to-spot-init-sections.patch
queue-6.1/module-expose-module_init_layout_section.patch
queue-6.1/arm64-module-use-module_init_layout_section-to-spot-init-sections.patch
