rpms/kernel/F-7 linux-2.6-params-sysfs-skip-missing-period.patch, NONE, 1.1 kernel-2.6.spec, 1.3361, 1.3362

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23824

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-params-sysfs-skip-missing-period.patch 
Log Message:
* Mon Oct 22 2007 Chuck Ebbert <cebbert at redhat.com>
- Don't create /sys/module/nousb/ (bz #242715)


linux-2.6-params-sysfs-skip-missing-period.patch:

--- NEW FILE linux-2.6-params-sysfs-skip-missing-period.patch ---
From: Dave Young <hidave.darkstar at gmail.com>
Date: Thu, 18 Oct 2007 10:05:07 +0000 (-0700)
Subject: param_sysfs_builtin memchr argument fix
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=faf8c714f4508207a9c81cc94dafc76ed6680b44

param_sysfs_builtin memchr argument fix

If memchr argument is longer than strlen(kp->name), there will be some
weird result.

It will casuse duplicate filenames in sysfs for the "nousb".  kernel
warning messages are as bellow:

sysfs: duplicate filename 'usbcore' can not be created
WARNING: at fs/sysfs/dir.c:416 sysfs_add_one()
 [<c01c4750>] sysfs_add_one+0xa0/0xe0
 [<c01c4ab8>] create_dir+0x48/0xb0
 [<c01c4b69>] sysfs_create_dir+0x29/0x50
 [<c024e0fb>] create_dir+0x1b/0x50
 [<c024e3b6>] kobject_add+0x46/0x150
 [<c024e2da>] kobject_init+0x3a/0x80
 [<c053b880>] kernel_param_sysfs_setup+0x50/0xb0
 [<c053b9ce>] param_sysfs_builtin+0xee/0x130
 [<c053ba33>] param_sysfs_init+0x23/0x60
 [<c024d062>] __next_cpu+0x12/0x20
 [<c052aa30>] kernel_init+0x0/0xb0
 [<c052aa30>] kernel_init+0x0/0xb0
 [<c052a856>] do_initcalls+0x46/0x1e0
 [<c01bdb12>] create_proc_entry+0x52/0x90
 [<c0158d4c>] register_irq_proc+0x9c/0xc0
 [<c01bda94>] proc_mkdir_mode+0x34/0x50
 [<c052aa30>] kernel_init+0x0/0xb0
 [<c052aa92>] kernel_init+0x62/0xb0
 [<c0104f83>] kernel_thread_helper+0x7/0x14
 =======================
kobject_add failed for usbcore with -EEXIST, don't try to register things with the same name in the same directory.
 [<c024e466>] kobject_add+0xf6/0x150
 [<c053b880>] kernel_param_sysfs_setup+0x50/0xb0
 [<c053b9ce>] param_sysfs_builtin+0xee/0x130
 [<c053ba33>] param_sysfs_init+0x23/0x60
 [<c024d062>] __next_cpu+0x12/0x20
 [<c052aa30>] kernel_init+0x0/0xb0
 [<c052aa30>] kernel_init+0x0/0xb0
 [<c052a856>] do_initcalls+0x46/0x1e0
 [<c01bdb12>] create_proc_entry+0x52/0x90
 [<c0158d4c>] register_irq_proc+0x9c/0xc0
 [<c01bda94>] proc_mkdir_mode+0x34/0x50
 [<c052aa30>] kernel_init+0x0/0xb0
 [<c052aa92>] kernel_init+0x62/0xb0
 [<c0104f83>] kernel_thread_helper+0x7/0x14
 =======================
Module 'usbcore' failed to be added to sysfs, error number -17
The system will be unstable now.

Signed-off-by: Dave Young <hidave.darkstar at gmail.com>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

bz 242715

diff --git a/kernel/params.c b/kernel/params.c
index 1d6aca2..16f269e 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -592,11 +592,17 @@ static void __init param_sysfs_builtin(void)
 
 	for (i=0; i < __stop___param - __start___param; i++) {
 		char *dot;
+		size_t kplen;
 
 		kp = &__start___param[i];
+		kplen = strlen(kp->name);
 
 		/* We do not handle args without periods. */
-		dot = memchr(kp->name, '.', MAX_KBUILD_MODNAME);
+		if (kplen > MAX_KBUILD_MODNAME) {
+			DEBUGP("kernel parameter name is too long: %s\n", kp->name);
+			continue;
+		}
+		dot = memchr(kp->name, '.', kplen);
 		if (!dot) {
 			DEBUGP("couldn't find period in %s\n", kp->name);
 			continue;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3361
retrieving revision 1.3362
diff -u -r1.3361 -r1.3362
--- kernel-2.6.spec	19 Oct 2007 17:56:09 -0000	1.3361
+++ kernel-2.6.spec	22 Oct 2007 16:52:54 -0000	1.3362
@@ -622,6 +622,8 @@
 Patch1500: linux-2.6-pmtrace-time-fix.patch
 Patch1510: linux-2.6-cputime-fix-accounting.patch
 
+Patch1600: linux-2.6-params-sysfs-skip-missing-period.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1295,6 +1297,9 @@
 # fix "top shows 9999% CPU usage"
 ApplyPatch linux-2.6-cputime-fix-accounting.patch
 
+# fix weird file in /sys/module/nousb
+ApplyPatch linux-2.6-params-sysfs-skip-missing-period.patch
+
 # END OF PATCH APPLICATIONS
 
 # Any further pre-build tree manipulations happen here.
@@ -2216,6 +2221,9 @@
 %endif
 
 %changelog
+* Mon Oct 22 2007 Chuck Ebbert <cebbert at redhat.com>
+- Don't create /sys/module/nousb/ (bz #242715)
+
 * Fri Oct 19 2007 John W. Linville <linville at redhat.com>
 - iwl4965-base.c: fix off-by-one errors
 - ipw2100: send WEXT scan events