Author: maks
Date: Mon Dec 17 20:40:47 2007
New Revision: 9969
Log:
Backport fix for CVE-2007-5938
iwlwifi: fix possible NULL dereference in iwl_set_rate()
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-null-deref.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/2
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Mon Dec 17 20:40:47 2007
@@ -79,6 +79,8 @@
* Add stable release 2.6.23.11:
- BRIDGE: Section fix.
- Revert "Freezer: Fix APM emulation breakage"
+ * Backport fix for CVE-2007-5938
+ - iwlwifi: fix possible NULL dereference in iwl_set_rate()
[ Martin Michlmayr ]
* [arm/iop32x] Re-enable USB_NET and PPP, thanks Daniel Hess (closes:
@@ -89,7 +91,7 @@
* [arm/versatile] Disable ACENIC and MYRI10GE as they are useless on this
platform.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 17 Dec 2007 17:03:00 +0100
+ -- maximilian attems <[EMAIL PROTECTED]> Mon, 17 Dec 2007 21:34:33 +0100
linux-2.6 (2.6.23-1) unstable; urgency=low
Added: dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-null-deref.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-null-deref.patch
Mon Dec 17 20:40:47 2007
@@ -0,0 +1,40 @@
+commit c4ba9621f4f241f8c4d4f620ad4257af59d21f3e
+Author: Saleem Abdulrasool <[EMAIL PROTECTED]>
+Date: Sun Nov 18 23:59:08 2007 -0800
+
+ iwlwifi: fix possible NULL dereference in iwl_set_rate()
+
+ Signed-off-by: Saleem Abdulrasool <[EMAIL PROTECTED]>
+ Signed-off-by: Zhu Yi <[EMAIL PROTECTED]>
+ Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
+
+diff --git a/drivers/net/wireless/iwl3945-base.c
b/drivers/net/wireless/iwl3945-base.c
+index 465da4f..5751c89 100644
+--- a/drivers/net/wireless/iwl3945-base.c
++++ b/drivers/net/wireless/iwl3945-base.c
+@@ -2915,6 +2915,10 @@ static void iwl_set_rate(struct iwl_priv *priv)
+ int i;
+
+ hw = iwl_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 --git a/drivers/net/wireless/iwl4965-base.c
b/drivers/net/wireless/iwl4965-base.c
+index 9918780..0b22e01 100644
+--- a/drivers/net/wireless/iwl4965-base.c
++++ b/drivers/net/wireless/iwl4965-base.c
+@@ -3003,6 +3003,10 @@ static void iwl_set_rate(struct iwl_priv *priv)
+ int i;
+
+ hw = iwl_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;
Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2 (original)
+++ dists/sid/linux-2.6/debian/patches/series/2 Mon Dec 17 20:40:47 2007
@@ -3,3 +3,4 @@
+ bugfix/sparc/sunfire-get_cpu.patch
+ bugfix/all/2.6.23.10
+ bugfix/all/2.6.23.11
++ bugfix/all/iwlwifi-null-deref.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
