On 12/12/05, Ashutosh Naik <[email protected]> wrote:
> Updating the correct email id of Anand Krishnan
> Signed-off-by: Anand Krishnan <[email protected]>
>
> On 12/12/05, Ashutosh Naik <[email protected]> wrote:
> > This patch is the next logical step after the following two threads
> >
> > http://www.uwsg.iu.edu/hypermail/linux/kernel/0511.2/2505.html
> > http://www.ussg.iu.edu/hypermail/linux/kernel/0511.3/0036.html
> >
> > When a symbol is exported from the kernel, and say, a module would
> > export the same symbol, there currently exists no mechanism to prevent
> > the module from exporting this symbol. The module would still go ahead
> > and export the symbol, the symbol table would now contain two copies
> > of the exported symbol, and hell would break loose.
> >
> > This patch prevents that from happening, by checking the symbol table
> > before relocation for all occurences of the Exported Symbol. If the
> > symbol already exists, we branch out with -ENOEXEC. Currently, this
> > search is sequential.
> >
> >
> > Signed-off-by: Ashutosh Naik <[email protected]>
> > Signed-off-by: Anand Krishnan <[email protected]>
> >
<grumble>it would be a lot easier to comment on patches if you
included them inline instead of as attachments</grumble>
>
> diff -Naurp linux-2.6.15-rc5-vanilla/kernel/module.c linux-2.6.15-rc5-mod/kernel/module.c
> --- linux-2.6.15-rc5-vanilla/kernel/module.c 2005-12-07 19:32:23.000000000 +0530
> +++ linux-2.6.15-rc5-mod/kernel/module.c 2005-12-12 17:47:28.000000000 +0530
> @@ -1204,6 +1204,63 @@ void *__symbol_get(const char *symbol)
> }
> EXPORT_SYMBOL_GPL(__symbol_get);
>
> +/*
> + * Ensure that an exported symbol [global namespace] does not already exist
> + * in the Kernel or in some other modules exported symbol table.
> + */
> +static int verify_export_symbols(Elf_Shdr *sechdrs,
> + const char *strtab,
> + struct module *mod)
> +{
> + struct kernel_symbol *exportsym, *gplsym;
> + unsigned long i,ret=0,value=0;
spaces after "," and before/after "=" please :
unsigned long i, ret = 0, value = 0;
> + struct module *owner;
> + const unsigned long *crc;
> + unsigned long index=0;
unsigned long index = 0;
> +
> + spin_lock_irq(&modlist_lock);
> +
I'm wondering, doesn't this take quite a long time? Too long to hold
a spinlock for?
Of course we need locking to prevent other module loads to modify the
symbol table while we are checking this one, but to prevent the kernel
from stalling everything else for a long time, wouldn't it be better
to use a semaphore (we can sleep with those - right?) and an explicit
schedule() call in the loop(s)? Or am I completely out in outere
space with that thought?
> + exportsym = (struct kernel_symbol *)mod->syms;
> + gplsym = (struct kernel_symbol *)mod->gpl_syms;
> +
> + if (exportsym)
> + for (i = 0; i < mod->num_syms; exportsym++,i++) {
> + index = (unsigned long)(exportsym->name);
> + if (exportsym->name) {
> + value = __find_symbol(strtab + index, &owner, &crc,1);
> +
> + if (value != 0)
if (unlikely(value)) ?????
> + goto duplicate_sym;
> + }
> + }
> +
> + if (gplsym)
> + for (i = 0; i < mod->num_gpl_syms; gplsym++,i++) {
> + index = (unsigned long)(gplsym->name);
> + if (gplsym->name) {
> + value = __find_symbol(strtab + index, &owner, &crc,1);
> +
> + if (value != 0)
if (unlikely(value)) ?????
> + goto duplicate_gpl_sym;
> + }
> + }
> +
> + spin_unlock_irq(&modlist_lock);
> + /*Done*/
> + return ret;
> +
> +duplicate_sym:
> + spin_unlock_irq(&modlist_lock);
> + printk("%s: Duplicate Exported Symbol found in %s\n",
Shouldn't this printk() be using KERN_ERROR ?
printk(KERN_ERROR "%s: Duplicate Exported Symbol found in %s\n",
> + strtab + index, mod->name);
> + return -ENOEXEC;
> +duplicate_gpl_sym:
> + spin_unlock_irq(&modlist_lock);
> + printk("%s: Duplicate Exported Symbol found in %s\n",
> + strtab + index, mod->name);
> + return -ENOEXEC;
> +}
Why 3 different exit paths? and 2 of them are even identical. Why not
something like this instead? :
{
...
if (unlikely(value) {
ret = -ENOEXEC;
goto out;
}
...
out:
spin_unlock_irq();
if (ret)
printk();
return ret;
}
> +
> /* Change all symbols so that sh_value encodes the pointer directly. */
> static int simplify_symbols(Elf_Shdr *sechdrs,
> unsigned int symindex,
> @@ -1502,10 +1559,10 @@ static struct module *load_module(void _
> {
> Elf_Ehdr *hdr;
> Elf_Shdr *sechdrs;
> - char *secstrings, *args, *modmagic, *strtab = NULL;
> + char *secstrings, *args, *modmagic, *strtab = NULL, *exportstrtab = NULL;
> unsigned int i, symindex = 0, strindex = 0, setupindex, exindex,
> - exportindex, modindex, obsparmindex, infoindex, gplindex,
> - crcindex, gplcrcindex, versindex, pcpuindex;
> + exportindex, exportstringindex, modindex, obsparmindex, infoindex,
> + gplindex, crcindex, gplcrcindex, versindex, pcpuindex;
> long arglen;
> struct module *mod;
> long err = 0;
> @@ -1585,6 +1642,7 @@ static struct module *load_module(void _
>
> /* Optional sections */
> exportindex = find_sec(hdr, sechdrs, secstrings, "__ksymtab");
> + exportstringindex = find_sec(hdr,sechdrs, secstrings, "__ksymtab_strings");
> gplindex = find_sec(hdr, sechdrs, secstrings, "__ksymtab_gpl");
> crcindex = find_sec(hdr, sechdrs, secstrings, "__kcrctab");
> gplcrcindex = find_sec(hdr, sechdrs, secstrings, "__kcrctab_gpl");
> @@ -1736,6 +1794,13 @@ static struct module *load_module(void _
> if (gplcrcindex)
> mod->gpl_crcs = (void *)sechdrs[gplcrcindex].sh_addr;
>
> + /* Find duplicate symbols */
> + exportstrtab = (void *)sechdrs[exportstringindex].sh_addr;
> + err = verify_export_symbols(sechdrs, exportstrtab, mod);
> +
> + if (err < 0)
> + goto cleanup;
> +
> #ifdef CONFIG_MODVERSIONS
> if ((mod->num_syms && !crcindex) ||
> (mod->num_gpl_syms && !gplcrcindex)) {
>
>
--
Jesper Juhl <[email protected]>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
