From dc2a2fb0b4371eac898f5c7d3116653eb3733ceb Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 9 May 2008 16:24:21 +1000 Subject: [PATCH] --- yaml --- r: 96229 b: refs/heads/master c: a5dd69707424a35d2d2cc094e870f595ad61e916 h: refs/heads/master i: 96227: 6227b1b31df28cd234ef5f7c021421f3407c4ae6 v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e44a317fe2f..352e49e0b17f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c2545eefffc452e52302c96c955d9aa26353aa9 +refs/heads/master: a5dd69707424a35d2d2cc094e870f595ad61e916 diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index 8e4528c9909f..2584c0e2762d 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -917,6 +917,10 @@ static int check_version(Elf_Shdr *sechdrs, if (!crc) return 1; + /* No versions at all? modprobe --force does this. */ + if (versindex == 0) + return try_to_force_load(mod, symname) == 0; + versions = (void *) sechdrs[versindex].sh_addr; num_versions = sechdrs[versindex].sh_size / sizeof(struct modversion_info); @@ -932,8 +936,9 @@ static int check_version(Elf_Shdr *sechdrs, goto bad_version; } - if (!try_to_force_load(mod, symname)) - return 1; + printk(KERN_WARNING "%s: no symbol version for %s\n", + mod->name, symname); + return 0; bad_version: printk("%s: disagrees about version of symbol %s\n",