---

yaml --- r: 73722 b: refs/heads/master c: 22800a2 h: refs/heads/master v: v3
git-mirror · Nov 15, 2007 · 92484a1 · 92484a1
1 parent 39e18cf
commit 92484a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fcc2d15b14894aa53e5e8b7fd5d6e3ca558e5df
+refs/heads/master: 22800a2830ec07e7cc5c837999890ac47cc7f5de
diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c
@@ -592,19 +592,16 @@ static void __init param_sysfs_builtin(void)
 
 	for (i=0; i < __stop___param - __start___param; i++) {
 		char *dot;
-		size_t kplen;
+		size_t max_name_len;
 
 		kp = &__start___param[i];
-		kplen = strlen(kp->name);
+		max_name_len =
+			min_t(size_t, MAX_KBUILD_MODNAME, strlen(kp->name));
 
-		/* We do not handle args without periods. */
-		if (kplen > MAX_KBUILD_MODNAME) {
-			DEBUGP("kernel parameter name is too long: %s\n", kp->name);
-			continue;
-		}
-		dot = memchr(kp->name, '.', kplen);
+		dot = memchr(kp->name, '.', max_name_len);
 		if (!dot) {
-			DEBUGP("couldn't find period in %s\n", kp->name);
+			DEBUGP("couldn't find period in first %d characters "
+			       "of %s\n", MAX_KBUILD_MODNAME, kp->name);
 			continue;
 		}
 		name_len = dot - kp->name;