Re: [PATCH] : More module parameter compatibility for 2.5.52

Rusty Russell (rusty@rustcorp.com.au)
Tue, 17 Dec 2002 15:20:10 +1100


In message <20021217012646.GA18021@bougret.hpl.hp.com> you write:
> Hi,
>
> I've just downloaded 2.5.52 to try the new module parameter
> support. Unfortunately, the letter 'c' was not implemented, and I need
> it. This is used in few drivers (such as hp100, wavelan, wlan_cs...).

Cool, an undocumented type! And they have explit sizes, and they're
used in arrays. Just wonderful.

I prefer the fix below. Does it work for you?

Rusty.

--
  Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Name: Implement c in MODULE_PARM compatibility wedge Author: Rusty Russell and Jean Tourrilhes Status: Experimental

D: The "c" MODULE_PARM type was missing, as pointed out by Jean Tourrilhes.

diff -urNp --exclude TAGS -X /home/rusty/current-dontdiff --minimal linux-2.5.52/kernel/module.c working-2.5.52-cparam/kernel/module.c --- linux-2.5.52/kernel/module.c Tue Dec 17 08:11:03 2002 +++ working-2.5.52-cparam/kernel/module.c Tue Dec 17 14:42:05 2002 @@ -569,10 +569,19 @@ static int param_string(const char *name return 0; } +/* Bounds checking done below */ +static int obsparm_copy_string(const char *val, struct kernel_param *kp) +{ + strcpy(kp->arg, val); + return 0; +} + extern int set_obsolete(const char *val, struct kernel_param *kp) { unsigned int min, max; - char *p, *endp; + unsigned int size, maxsize; + char *endp; + const char *p; struct obsolete_modparm *obsparm = kp->arg; if (!val) { @@ -605,8 +614,29 @@ extern int set_obsolete(const char *val, sizeof(long), param_set_long); case 's': return param_string(kp->name, val, min, max, obsparm->addr); + + case 'c': + /* Undocumented: 1-5c50 means 1-5 strings of up to 49 chars, + and the decl is "char xxx[5][50];" */ + p = endp+1; + maxsize = simple_strtol(p, &endp, 10); + /* We check lengths here (yes, this is a hack). */ + p = val; + while (p[size = strcspn(p, ",")]) { + if (size >= maxsize) + goto oversize; + p += size+1; + } + if (size >= maxsize) + goto oversize; + return param_array(kp->name, val, min, max, obsparm->addr, + maxsize, obsparm_copy_string); } printk(KERN_ERR "Unknown obsolete parameter type %s\n", obsparm->type); + return -EINVAL; + oversize: + printk(KERN_ERR + "Parameter %s doesn't fit in %u chars.\n", kp->name, maxsize); return -EINVAL; } - 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/