module: check symbol name offsets

[modules-kpd-app]

Pull request for series with
subject: module: check symbol name offsets
version: 1
url: https://patchwork.kernel.org/project/linux-modules/list/?series=901008

[modules-kpd-app]

Upstream branch: 9852d85
series: https://patchwork.kernel.org/project/linux-modules/list/?series=901008
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-modules/list/?series=901008
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: module: check symbol name offsets
Using index info to reconstruct a base tree...
M	kernel/module/main.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/module/main.c
CONFLICT (content): Merge conflict in kernel/module/main.c
Patch failed at 0001 module: check symbol name offsets'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc kernel/module/main.c
index 49b9bca9de12,c926960aed6d..000000000000
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@@ -1848,6 -1849,29 +1849,32 @@@ static int elf_validity_cache_copy(stru
  	info->strtab = (char *)info->hdr + info->sechdrs[info->index.str].sh_offset;
  
  	/*
++<<<<<<< HEAD
++=======
+ 	 * The string table must be NUL-terminated, as required
+ 	 * by the spec. This makes strcmp and pr_* calls that access
+ 	 * strings in the section safe.
+ 	 */
+ 	strhdr = &info->sechdrs[info->index.str];
+ 	if (strhdr->sh_size > 0 && info->strtab[strhdr->sh_size - 1] != '\0') {
+ 		pr_err("module %s: string table isn't null terminated\n",
+ 		       info->name ?: "(missing .modinfo section or name field)");
+ 		goto no_exec;
+ 	}
+ 
+ 	/* Symbol names must point into string table. */
+ 	shdr = &info->sechdrs[info->index.sym];
+ 	sym = (void *)info->hdr + shdr->sh_offset;
+ 	for (i = 1; i < shdr->sh_size / sizeof(Elf_Sym); i++) {
+ 		if (sym[i].st_name >= strhdr->sh_size) {
+ 			pr_err("module %s: illegal symbol name offset encountered\n",
+ 			       info->name ?: "(missing .modinfo section or name field)");
+ 			goto no_exec;
+ 		}
+ 	}
+ 
+ 	/*
++>>>>>>> module: check symbol name offsets
  	 * The ".gnu.linkonce.this_module" ELF section is special. It is
  	 * what modpost uses to refer to __this_module and let's use rely
  	 * on THIS_MODULE to point to &__this_module properly. The kernel's

[modules-kpd-app]

At least one diff in series https://patchwork.kernel.org/project/linux-modules/list/?series=901008 irrelevant now. Closing PR.