rpms/kernel/devel linux-2.6-iwlwifi-cve-2007-5938.patch, NONE, 1.1 kernel.spec, 1.255, 1.256

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11275

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-iwlwifi-cve-2007-5938.patch 
Log Message:
Fix NULL ptr reference in iwlwifi (CVE-2007-5938)

linux-2.6-iwlwifi-cve-2007-5938.patch:

--- NEW FILE linux-2.6-iwlwifi-cve-2007-5938.patch ---
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c.orig	2007-11-27 15:17:07.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl3945-base.c	2007-11-27 15:20:47.000000000 -0500
@@ -2907,6 +2907,10 @@ static void iwl3945_set_rate(struct iwl3
 	int i;
 
 	hw = iwl3945_get_hw_mode(priv, priv->phymode);
+	if (!hw) {
+		IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+		return;
+	}
 
 	priv->active_rate = 0;
 	priv->active_rate_basic = 0;
diff -up linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c.orig	2007-11-27 15:17:07.000000000 -0500
+++ linux-2.6.23.noarch/drivers/net/wireless/iwlwifi/iwl4965-base.c	2007-11-27 15:20:47.000000000 -0500
@@ -3000,6 +3000,10 @@ static void iwl4965_set_rate(struct iwl4
 	int i;
 
 	hw = iwl4965_get_hw_mode(priv, priv->phymode);
+	if (!hw) {
+		IWL_ERROR("Failed to set rate: unable to get hw mode\n");
+		return;
+	}
 
 	priv->active_rate = 0;
 	priv->active_rate_basic = 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- kernel.spec	27 Nov 2007 19:18:54 -0000	1.255
+++ kernel.spec	27 Nov 2007 20:26:07 -0000	1.256
@@ -607,6 +607,7 @@
 Patch670: linux-2.6-ata-quirk.patch
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
+Patch682: linux-2.6-iwlwifi-cve-2007-5938.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
 Patch692: linux-2.6-zd1211rw-mac80211.patch
@@ -1097,6 +1098,9 @@
 # wireless patches headed for 2.6.25
 ApplyPatch linux-2.6-wireless-pending.patch
 
+# fix CVE-2007-5938
+ApplyPatch linux-2.6-iwlwifi-cve-2007-5938.patch
+
 # Add misc wireless bits from upstream wireless tree
 ApplyPatch linux-2.6-at76.patch
 ApplyPatch linux-2.6-ath5k.patch
@@ -1705,6 +1709,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Tue Nov 27 2007 John W. Linville <linville at redhat.com>
+* Fix NULL ptr reference in iwlwifi (CVE-2007-5938)
+
 * Tue Nov 27 2007 Dave Jones <davej at redhat.com>
 - 2.6.24-rc3-git2