summaryrefslogtreecommitdiffstats
path: root/kernel/params.c
diff options
context:
space:
mode:
authorRusty Russell2008-10-22 17:00:22 +0200
committerRusty Russell2008-10-22 01:00:22 +0200
commit730b69d225259565c705f5f5a11cb1aba69568f1 (patch)
tree9ae3f20102d06d83b23dbbed1ae8acb86e01e7ea /kernel/params.c
parentRemove stop_machine during module load v2 (diff)
downloadkernel-qcow2-linux-730b69d225259565c705f5f5a11cb1aba69568f1.tar.gz
kernel-qcow2-linux-730b69d225259565c705f5f5a11cb1aba69568f1.tar.xz
kernel-qcow2-linux-730b69d225259565c705f5f5a11cb1aba69568f1.zip
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/params.c')
-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)
{
struct kernel_param *kp, *kp_begin = NULL;
unsigned int i, name_len, count = 0;
- char modname[MODULE_NAME_LEN + 1] = "";
+ char modname[MODULE_NAME_LEN] = "";
for (i=0; i < __stop___param - __start___param; i++) {
char *dot;
- size_t max_name_len;
kp = &__start___param[i];
- max_name_len =
- min_t(size_t, MODULE_NAME_LEN, strlen(kp->name));
- dot = memchr(kp->name, '.', max_name_len);
+ dot = strchr(kp->name, '.');
if (!dot) {
DEBUGP("couldn't find period in first %d characters "
"of %s\n", MODULE_NAME_LEN, kp->name);