rpms/mdadm/devel mdadm-3.0-calloc.patch, NONE, 1.1 mdadm.spec, 1.73, 1.74

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24035

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.0-calloc.patch 
Log Message:
* Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
- Stop some mdmon segfaults (bz523860)


mdadm-3.0-calloc.patch:
 mdmon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdadm-3.0-calloc.patch ---
diff -up mdadm-3.0/mdmon.c~ mdadm-3.0/mdmon.c
--- mdadm-3.0/mdmon.c~	2009-09-11 08:10:24.000000000 +0200
+++ mdadm-3.0/mdmon.c	2009-09-16 22:42:21.000000000 +0200
@@ -395,7 +395,7 @@ int mdmon(char *devname, int devnum, int
 	} else
 		pfd[0] = pfd[1] = -1;
 
-	container = malloc(sizeof(*container));
+	container = calloc(1, sizeof(*container));
 	container->devnum = devnum;
 	container->devname = devname;
 	container->arrays = NULL;


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- mdadm.spec	15 Sep 2009 19:03:58 -0000	1.73
+++ mdadm.spec	17 Sep 2009 11:43:33 -0000	1.74
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.0
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-0.20090915git.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -11,6 +11,7 @@ Patch1:      mdadm-2.5.2-static.patch
 Patch2:      mdadm-3.0-endian-FAIL.patch
 Patch3:      mdadm-3.0-metadata.patch
 Patch4:      mdadm-3.0-uuid.patch
+Patch5:      mdadm-3.0-calloc.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
 Group:       System Environment/Base
@@ -35,6 +36,7 @@ file can be used to help with some commo
 %patch2 -p1 -b .endian
 %patch3 -p1 -b .metadata
 %patch4 -p1 -b .uuid
+%patch5 -p1 -b .calloc
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@@ -80,6 +82,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Thu Sep 17 2009 Doug Ledford <dledford at redhat.com> - 3.0-4
+- Stop some mdmon segfaults (bz523860)
+
 * Tue Sep 15 2009 Doug Ledford <dledford at redhat.com> - 3.0-3
 - Update to current head of upstream git repo for various imsm related fixes
   (fixes bz523262)