rpms/module-init-tools/devel module-init-tools-badmodule.patch, NONE, 1.1 module-init-tools.spec, 1.11, 1.12

[fedora-cvs-commits redhat com]

Author: notting

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31504

Modified Files:
	module-init-tools.spec 
Added Files:
	module-init-tools-badmodule.patch 
Log Message:
fix segfault on bad modules (#162716)


module-init-tools-badmodule.patch:
 moduleops_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE module-init-tools-badmodule.patch ---
--- module-init-tools-3.1/moduleops_core.c.foo	2005-07-22 17:01:24.000000000 -0400
+++ module-init-tools-3.1/moduleops_core.c	2005-07-22 17:02:01.000000000 -0400
@@ -92,6 +92,8 @@
 	strings = PERBIT(load_section)(module->data, ".strtab", &size);
 	syms = PERBIT(load_section)(module->data, ".symtab", &size);
 
+	module->num_deps = 0;
+	module->deps = NULL;
 	if (!strings || !syms) {
 		warn("Couldn't find symtab and strtab in module %s\n",
 		     module->pathname);
@@ -104,8 +106,6 @@
 	    hdr->e_machine == EM_SPARCV9)
 		handle_register_symbols = 1;
 
-	module->num_deps = 0;
-	module->deps = NULL;
 	for (i = 1; i < size / sizeof(syms[0]); i++) {
 		if (syms[i].st_shndx == SHN_UNDEF) {
 			/* Look for symbol */


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- module-init-tools.spec	8 Jul 2005 19:46:06 -0000	1.11
+++ module-init-tools.spec	22 Jul 2005 21:11:04 -0000	1.12
@@ -2,13 +2,14 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.1
+Release: 0.%{preversion}.2
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2
 Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2.sign
 Source2: modprobe.conf.dist
 Patch1: module-init-tools-allconf.patch
+Patch2: module-init-tools-badmodule.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modules modutils-devel modutils
@@ -25,6 +26,7 @@
 %prep
 %setup -q -n module-init-tools-%{version}-%{preversion}
 %patch1 -p1 -b .dist
+%patch2 -p1 -b .boom
 
 %build
 export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -86,6 +88,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jul 22 2005 Bill Nottingham <notting redhat com> 3.2-0.pre7.2
+- fix depmod segfault on bad modules (#162716)
+
 * Fri Jul  8 2005 Bill Nottingham <notting redhat com> 3.2-0.pre7.1
 - update to 3.2-pre7
 - put modprobe.conf.dist in /etc/modprobe.d