aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Cheng <crquan@gmail.com>2008-01-21 04:08:25 -0500
committerRusty Russell <rusty@rustcorp.com.au>2008-01-29 01:13:24 -0500
commit8686c99875f3849047660a5b6d02438443f22ce7 (patch)
tree42eca5ce8533f973553376e4afbe7362608bf01d
parent6dd06c9fbe025f542bce4cdb91790c0f91962722 (diff)
module: fix the module name length in param_sysfs_builtin
the original code use KOBJ_NAME_LEN for built-in module name length, that's defined to 20 in linux/kobject.h, but this is not enough appearntly, many module names are longer than this; #define KOBJ_NAME_LEN 20 another macro is MODULE_NAME_LEN defined in linux/module.h, I think this is enough for module names: #define MODULE_NAME_LEN (64 - sizeof(unsigned long)) Signed-off-by: Denis Cheng <crquan@gmail.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--kernel/params.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/params.c b/kernel/params.c
index 67f65ee7211d..42fe5e6126c0 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -376,8 +376,6 @@ int param_get_string(char *buffer, struct kernel_param *kp)
376 376
377extern struct kernel_param __start___param[], __stop___param[]; 377extern struct kernel_param __start___param[], __stop___param[];
378 378
379#define MAX_KBUILD_MODNAME KOBJ_NAME_LEN
380
381struct param_attribute 379struct param_attribute
382{ 380{
383 struct module_attribute mattr; 381 struct module_attribute mattr;
@@ -587,7 +585,7 @@ static void __init param_sysfs_builtin(void)
587{ 585{
588 struct kernel_param *kp, *kp_begin = NULL; 586 struct kernel_param *kp, *kp_begin = NULL;
589 unsigned int i, name_len, count = 0; 587 unsigned int i, name_len, count = 0;
590 char modname[MAX_KBUILD_MODNAME + 1] = ""; 588 char modname[MODULE_NAME_LEN + 1] = "";
591 589
592 for (i=0; i < __stop___param - __start___param; i++) { 590 for (i=0; i < __stop___param - __start___param; i++) {
593 char *dot; 591 char *dot;
@@ -595,12 +593,12 @@ static void __init param_sysfs_builtin(void)
595 593
596 kp = &__start___param[i]; 594 kp = &__start___param[i];
597 max_name_len = 595 max_name_len =
598 min_t(size_t, MAX_KBUILD_MODNAME, strlen(kp->name)); 596 min_t(size_t, MODULE_NAME_LEN, strlen(kp->name));
599 597
600 dot = memchr(kp->name, '.', max_name_len); 598 dot = memchr(kp->name, '.', max_name_len);
601 if (!dot) { 599 if (!dot) {
602 DEBUGP("couldn't find period in first %d characters " 600 DEBUGP("couldn't find period in first %d characters "
603 "of %s\n", MAX_KBUILD_MODNAME, kp->name); 601 "of %s\n", MODULE_NAME_LEN, kp->name);
604 continue; 602 continue;
605 } 603 }
606 name_len = dot - kp->name; 604 name_len = dot - kp->name;