Commit 1b364bf4 authored Aug 26, 2009 by James Bottomley Committed by Linus Torvalds Aug 27, 2009

module: workaround duplicate section names



The root cause is a duplicate section name (.text); is this legal?
[ Amerigo Wang: "AFAIK, yes." ]

However, there's a problem with commit
6d760133 in that if you fail to allocate
a mod->sect_attrs (in this case it's null because of the duplication),
it still gets used without checking in add_notes_attrs()

This should fix it

[ This patch leaves other problems, particularly the sections directory,
  but recent parisc toolchains seem to produce these modules and this
  prevents a crash and is a minimal change -- RR ]

Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Tested-by: Helge Deller <deller@gmx.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7d1d16e4

kernel/module.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2355,6 +2355,7 @@ static noinline struct module load_module(void __user umod,
		if (err < 0)
		goto unlink;
		add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
		if (mod->sect_attrs)
		add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);

		/* Get rid of temporary copy */

Admin message