In message <20030128083117.A15637@twiddle.net> you write:
> On Tue, Jan 28, 2003 at 09:38:31PM +1100, Rusty Russell wrote:
> > But once again you are relying on link order to keep the crcs
> > section in the same order as the ksymtab section (although the ld
> > documentation says that's correct, I know RTH doesn't like it).
>
> What gave you that idea? Link order is a fine thing to rely on.
OK, I stand corrected. Sorry Kai, I guess this means that struct
kernel_symbol can drop the pointer, too. I'll dig out the old patch
and resend it.
I also dropped the "ignore vermagic if modversions set": you were
right that that's a bad idea, too.
So, here is my much reduced patch on top of yours. Please read
carefully since I'm obviously not having a great week 8)
Thanks!
Rusty.
-- Anyone who quotes me in their sig is an idiot. -- Rusty Russell.Name: Tweaks to Module Versions Author: Rusty Russell Depends: Module/modversions.patch.gz Status: Experimental
D: Fix the case where no CRCs are supplied (OK, but taints kernel), and D: only print one tainted message (otherwise --force gives hundreds of them).
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .1440-linux-2.5.59/init/Kconfig .1440-linux-2.5.59.updated/init/Kconfig --- .1440-linux-2.5.59/init/Kconfig 2003-01-29 11:13:07.000000000 +1100 +++ .1440-linux-2.5.59.updated/init/Kconfig 2003-01-29 11:14:00.000000000 +1100 @@ -147,7 +147,6 @@ config OBSOLETE_MODPARM config MODVERSIONING bool "Module versioning support (EXPERIMENTAL)" depends on MODULES && EXPERIMENTAL - help ---help--- Usually, you have to use modules compiled with your kernel. Saying Y here makes it sometimes possible to use modules diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .1440-linux-2.5.59/kernel/module.c .1440-linux-2.5.59.updated/kernel/module.c --- .1440-linux-2.5.59/kernel/module.c 2003-01-29 11:13:07.000000000 +1100 +++ .1440-linux-2.5.59.updated/kernel/module.c 2003-01-29 11:13:43.000000000 +1100 @@ -737,12 +737,9 @@ static int check_version(Elf_Shdr *sechd unsigned int i, num_versions; struct modversion_info *versions; - if (!ksg->crcs) { - printk("%s: no CRC for \"%s\" [%s] found: kernel tainted.\n", - mod->name, symname, - ksg->owner ? ksg->owner->name : "kernel"); - goto taint; - } + /* Exporting module didn't supply crcs? OK, we're already tainted. */ + if (!ksg->crcs) + return 1; crc = ksg->crcs[symidx]; @@ -763,10 +760,11 @@ static int check_version(Elf_Shdr *sechd return 0; } /* Not in module's version table. OK, but that taints the kernel. */ - printk("%s: no version for \"%s\" found: kernel tainted.\n", - mod->name, symname); - taint: - tainted |= TAINT_FORCED_MODULE; + if (!(tainted & TAINT_FORCED_MODULE)) { + printk("%s: no version for \"%s\" found: kernel tainted.\n", + mod->name, symname); + tainted |= TAINT_FORCED_MODULE; + } return 1; } #else @@ -1273,11 +1271,23 @@ static struct module *load_module(void * mod->symbols.num_syms = (sechdrs[exportindex].sh_size / sizeof(*mod->symbols.syms)); mod->symbols.syms = (void *)sechdrs[exportindex].sh_addr; - mod->symbols.crcs = (void *)sechdrs[crcindex].sh_addr; + if (crcindex) + mod->symbols.crcs = (void *)sechdrs[crcindex].sh_addr; + mod->gpl_symbols.num_syms = (sechdrs[gplindex].sh_size / sizeof(*mod->symbols.syms)); mod->gpl_symbols.syms = (void *)sechdrs[gplindex].sh_addr; - mod->gpl_symbols.crcs = (void *)sechdrs[gplcrcindex].sh_addr; + if (gplcrcindex) + mod->gpl_symbols.crcs = (void *)sechdrs[gplcrcindex].sh_addr; + +#ifdef CONFIG_MODVERSIONING + if ((mod->symbols.num_syms && !crcindex) + || (mod->gpl_symbols.num_syms && !gplcrcindex)) + printk(KERN_WARNING "%s: No versions for exported symbols." + " Tainting kernel.\n", mod->name); + tainted |= TAINT_FORCED_MODULE; + } +#endif /* CONFIG_MODVERSIONING */ /* Set up exception table */ if (exindex) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Jan 31 2003 - 22:00:20 EST