aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-10-22 11:00:22 -0400
committerRusty Russell <rusty@rustcorp.com.au>2008-10-21 19:00:22 -0400
commit730b69d225259565c705f5f5a11cb1aba69568f1 (patch)
tree9ae3f20102d06d83b23dbbed1ae8acb86e01e7ea /kernel
parentd72b37513cdfbd3f53f3d485a8c403cc96d2c95f (diff)
module: check kernel param length at compile time, not runtime
The kparam code tries to handle over-length parameter prefixes at runtime. Not only would I bet this has never been tested, it's not clear that truncating names is a good idea either. So let's check at compile time. We need to move the #define to moduleparam.h to do this, though. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/params.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/params.c b/kernel/params.c
index afc46a23eb6d..aca07e1a050f 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -585,17 +585,14 @@ static void __init param_sysfs_builtin(void)
585{ 585{
586 struct kernel_param *kp, *kp_begin = NULL; 586 struct kernel_param *kp, *kp_begin = NULL;
587 unsigned int i, name_len, count = 0; 587 unsigned int i, name_len, count = 0;
588 char modname[MODULE_NAME_LEN + 1] = ""; 588 char modname[MODULE_NAME_LEN] = "";
589 589
590 for (i=0; i < __stop___param - __start___param; i++) { 590 for (i=0; i < __stop___param - __start___param; i++) {
591 char *dot; 591 char *dot;
592 size_t max_name_len;
593 592
594 kp = &__start___param[i]; 593 kp = &__start___param[i];
595 max_name_len =
596 min_t(size_t, MODULE_NAME_LEN, strlen(kp->name));
597 594
598 dot = memchr(kp->name, '.', max_name_len); 595 dot = strchr(kp->name, '.');
599 if (!dot) { 596 if (!dot) {
600 DEBUGP("couldn't find period in first %d characters " 597 DEBUGP("couldn't find period in first %d characters "
601 "of %s\n", MODULE_NAME_LEN, kp->name); 598 "of %s\n", MODULE_NAME_LEN, kp->name);