rpms/iscsi-initiator-utils/devel open-iscsi-2.0-870.1-490515-workaround.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.41, 1.42

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-2.0-870.1-490515-workaround.patch 
Log Message:
* Fri Mar 20 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-7
- libiscsi: use fwparam_ibft_sysfs() instead of fw_get_entry(), as
  the latter causes stack corruption (workaround #490515)


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

--- NEW FILE open-iscsi-2.0-870.1-490515-workaround.patch ---
--- open-iscsi-2.0-870.1/libiscsi/libiscsi.c	2009-03-20 15:21:24.000000000 +0100
+++ new/libiscsi/libiscsi.c	2009-03-20 15:21:11.000000000 +0100
@@ -196,10 +196,10 @@
 		*found_nodes = NULL;
 
 	memset(&fw_entry, 0, sizeof fw_entry);
-	rc = fw_get_entry(&fw_entry, NULL);
+	rc = fwparam_ibft_sysfs(&fw_entry, NULL);
 	if (rc) {
 		strcpy(context->error_str, "Could not read fw values.");
-		return rc;
+		return ENODEV;
 	}
 
 	memset(&rec, 0, sizeof rec);
@@ -535,8 +535,10 @@
 
 	memset(config, 0, sizeof *config);
 	memset(&fw_entry, 0, sizeof fw_entry);
-	if (fw_get_entry(&fw_entry, NULL))
+	if (fwparam_ibft_sysfs(&fw_entry, NULL)) {
+		strcpy(context->error_str, "Could not read fw values.");
 		return ENODEV;
+	}
 
 	config->dhcp = strlen(fw_entry.dhcp) ? 1 : 0;
 	strncpy(config->iface_name, fw_entry.iface, sizeof fw_entry.iface);
@@ -557,8 +559,10 @@
 
 	memset(initiatorname, 0, LIBISCSI_VALUE_MAXLEN);
 	memset(&fw_entry, 0, sizeof fw_entry);
-	if (fw_get_entry(&fw_entry, NULL))
+	if (fwparam_ibft_sysfs(&fw_entry, NULL)) {
+		strcpy(context->error_str, "Could not read fw values.");
 		return ENODEV;
+	}
 
 	strncpy(initiatorname, fw_entry.initiatorname,
 		sizeof fw_entry.initiatorname);


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- iscsi-initiator-utils.spec	14 Mar 2009 18:25:00 -0000	1.41
+++ iscsi-initiator-utils.spec	20 Mar 2009 14:24:54 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.870
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -19,6 +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
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -57,6 +58,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 
 %build
@@ -160,6 +162,10 @@
 %{_includedir}/libiscsi.h
 
 %changelog
+* Fri Mar 20 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-7
+- libiscsi: use fwparam_ibft_sysfs() instead of fw_get_entry(), as
+  the latter causes stack corruption (workaround #490515)
+
 * Sat Mar 14 2009 Terje Rosten <terje.rosten at ntnu.no> - 6.2.0.870-6
 - Add glibc-static to buildreq to build in F11