Commit a5dd6970 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

module: be more picky about allowing missing module versions

We allow missing __versions sections, because modprobe --force strips
it.  It makes less sense to allow sections where there's no version
for a specific symbol the module uses, so disallow that.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c2545ee
...@@ -917,6 +917,10 @@ static int check_version(Elf_Shdr *sechdrs, ...@@ -917,6 +917,10 @@ static int check_version(Elf_Shdr *sechdrs,
if (!crc) if (!crc)
return 1; 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; versions = (void *) sechdrs[versindex].sh_addr;
num_versions = sechdrs[versindex].sh_size num_versions = sechdrs[versindex].sh_size
/ sizeof(struct modversion_info); / sizeof(struct modversion_info);
...@@ -932,8 +936,9 @@ static int check_version(Elf_Shdr *sechdrs, ...@@ -932,8 +936,9 @@ static int check_version(Elf_Shdr *sechdrs,
goto bad_version; goto bad_version;
} }
if (!try_to_force_load(mod, symname)) printk(KERN_WARNING "%s: no symbol version for %s\n",
return 1; mod->name, symname);
return 0;
bad_version: bad_version:
printk("%s: disagrees about version of symbol %s\n", printk("%s: disagrees about version of symbol %s\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment