Attachment 587827 Details for Bug 825944 – Fix REL table digestion

[patch] Fix REL table digestion

modsign-fix-REL-handling.patch (text/plain), 1.41 KB, created by David Howells on 2012-05-30 19:33:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Howells

Created: 2012-05-30 19:33:57 UTC

Size: 1.41 KB

patch

obsolete

>commit a5ca2e0eb4b0250436e7c4ad2c6fe5ad082ec993
>Author: David Howells <dhowells@redhat.com>
>Date:   Wed May 30 20:31:27 2012 +0100
>
>MODSIGN: Interpret REL table parameters properly
>
>Interpret REL table parameters properly in extract_elf_rel(), in particular
>determine the symbol table correctly.  Making that part of the code the same
>as in extract_elf_rela() does the job.
>
>Signed-off-by: David Howells <dhowells@redhat.com>
>
>diff --git a/kernel/module-verify.c b/kernel/module-verify.c
>index 3b0f5ec..cbee21c 100644
>--- a/kernel/module-verify.c
>+++ b/kernel/module-verify.c
>@@ -391,16 +391,19 @@ static int extract_elf_rel(struct module_verify_data *mvdata,
> #endif
> 	} __packed relocation;
> 
>+	const Elf_Shdr *relsec, *symsec, *strsec;
> 	const Elf_Rel *reloc;
> 	const Elf_Sym *symbols, *symbol;
> 	const char *strings;
> 	unsigned long r_sym;
> 	size_t nsyms, loop;
> 
>-	nsyms = mvdata->sections[secix].sh_size / sizeof(Elf_Sym);
>-	symbols = mvdata->buffer + mvdata->sections[secix].sh_offset;
>-	strings = mvdata->buffer +
>-		mvdata->sections[mvdata->sections[secix].sh_link].sh_offset;
>+	relsec = &mvdata->sections[secix];
>+	symsec = &mvdata->sections[relsec->sh_link];
>+	strsec = &mvdata->sections[symsec->sh_link];
>+	nsyms = symsec->sh_size / sizeof(Elf_Sym);
>+	symbols = mvdata->buffer + symsec->sh_offset;
>+	strings = mvdata->buffer + strsec->sh_offset;
> 
> 	/* Contribute the relevant bits from a join of
> 	 * { REL, SYMBOL, SECTION }

Actions: View | Diff

Attachments on bug 825944: 587827