rpms/iscsi-initiator-utils/devel open-iscsi-2.0-870.1-fwparam-ppc-crash.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.43, 1.44 open-iscsi-2.0-870.1-490515-workaround.patch, 1.2, NONE

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6248

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-2.0-870.1-fwparam-ppc-crash.patch 
Removed Files:
	open-iscsi-2.0-870.1-490515-workaround.patch 
Log Message:
* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-9
- Don't crash when asked to parse the ppc firmware table more then
  once (which can be done from libiscsi) (#491363)


open-iscsi-2.0-870.1-fwparam-ppc-crash.patch:

--- NEW FILE open-iscsi-2.0-870.1-fwparam-ppc-crash.patch ---
diff -up open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c.crash open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c
--- open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c.crash	2008-11-22 18:06:46.000000000 +0100
+++ open-iscsi-2.0-870.1/utils/fwparam_ibft/fwparam_ppc.c	2009-04-27 20:33:33.000000000 +0200
@@ -341,6 +341,7 @@ static int loop_devs(const char *devtree
 	int i;
 	char prefix[256];
 
+	nic_count = 0;
 	error = nftw(devtree, find_nics, 20, 0);
 	if (error)
 		return error;
@@ -352,6 +353,7 @@ static int loop_devs(const char *devtree
 	qsort(niclist, nic_count, sizeof(char *), nic_cmp);
 
 	snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases");
+	dev_count = 0;
 	error = nftw(prefix, find_initiator, 20, 0);
 	if (error)
 		return error;
@@ -366,8 +368,6 @@ static int loop_devs(const char *devtree
 
 		}
 	}
-	if (!error)
-		putchar('\n');
 	return error;
 }
 
@@ -425,7 +425,7 @@ static void fill_context(struct boot_con
 int fwparam_ppc(struct boot_context *context, const char *filepath)
 {
 	int error;
-	int fplen = 0;
+	int dev_count;
 	char *devtree;
 
 	/*
@@ -435,13 +435,10 @@ int fwparam_ppc(struct boot_context *con
 	 * systems that can support iscsi are the ones that provide
 	 * the appropriate FCODE with a load method.
 	 */
-	if (filepath) {
-		strncat(filename, filepath, FILENAMESZ);
-		fplen = strlen(filename);
-	} else
-		strncat(filename, DT_TOP, FILENAMESZ);
-
-	strncat(filename + fplen, BOOTPATH, FILENAMESZ - fplen);
+	if (filepath)  
+		snprintf(filename, FILENAMESZ, "%s%s", filepath, BOOTPATH);
+	else
+		snprintf(filename, FILENAMESZ, "%s%s", DT_TOP, BOOTPATH);
 
 	if (debug)
 		fprintf(stderr, "%s: file:%s; debug:%d\n", __func__, filename,


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- iscsi-initiator-utils.spec	3 Apr 2009 07:29:43 -0000	1.43
+++ iscsi-initiator-utils.spec	27 Apr 2009 18:38:29 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -19,7 +19,7 @@
 Patch8: open-iscsi-2.0-870.1-no-exit.patch
 Patch9: open-iscsi-2.0-870.1-ibft-newer-kernel.patch
 Patch10: open-iscsi-2.0-870.1-485217.patch
-Patch11: open-iscsi-2.0-870.1-490515-workaround.patch
+Patch11: open-iscsi-2.0-870.1-fwparam-ppc-crash.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -162,6 +162,10 @@
 %{_includedir}/libiscsi.h
 
 %changelog
+* Mon Apr 27 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-9
+- Don't crash when asked to parse the ppc firmware table more then
+  once (which can be done from libiscsi) (#491363)
+
 * Fri Apr  3 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-8
 - Stop the NM script from exiting with an error status when it
   didn't do anything (#493411)


--- open-iscsi-2.0-870.1-490515-workaround.patch DELETED ---