rpms/kernel/devel patch-2.6.24-rc8-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.756, 1.757 kernel.spec, 1.382, 1.383 linux-2.6-wireless-reverts.patch, 1.3, 1.4 sources, 1.716, 1.717 upstream, 1.638, 1.639 patch-2.6.24-rc8-git6.bz2.sign, 1.1, NONE

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Thu Jan 24 17:41:16 UTC 2008


Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-wireless-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.24-rc8-git7.bz2.sign 
Removed Files:
	patch-2.6.24-rc8-git6.bz2.sign 
Log Message:
* Thu Jan 24 2008 Chuck Ebbert <cebbert at redhat.com>
- Linux 2.6.24-rc8-git7



--- NEW FILE patch-2.6.24-rc8-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBHmDhkyGugalF9Dw4RAuW/AJ95F3CDajmjgNpZjim9is6LSD5D5wCdG1sA
uHT/qUDu769MCe7oPP84QT8=
=8oUG
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -r1.756 -r1.757
--- .cvsignore	23 Jan 2008 20:37:52 -0000	1.756
+++ .cvsignore	24 Jan 2008 17:40:25 -0000	1.757
@@ -5,4 +5,4 @@
 kernel-2.6.23
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc8.bz2
-patch-2.6.24-rc8-git6.bz2
+patch-2.6.24-rc8-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- kernel.spec	24 Jan 2008 04:15:13 -0000	1.382
+++ kernel.spec	24 Jan 2008 17:40:25 -0000	1.383
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 8
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1758,6 +1758,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Jan 24 2008 Chuck Ebbert <cebbert at redhat.com>
+- Linux 2.6.24-rc8-git7
+
 * Wed Jan 23 2008 Dave Jones <davej at redhat.com>
 - Drop GFS1 export patch.  Really, use GFS2 instead.
 

linux-2.6-wireless-reverts.patch:

Index: linux-2.6-wireless-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-reverts.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-wireless-reverts.patch	23 Jan 2008 20:37:52 -0000	1.3
+++ linux-2.6-wireless-reverts.patch	24 Jan 2008 17:40:25 -0000	1.4
@@ -40,3 +40,57 @@
  		rfkill_remove_switch(rfkill);
  		return error;
  	}
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a781cf94e6dcc09bf13e548298185d916d9ff3c8
+Commit:     a781cf94e6dcc09bf13e548298185d916d9ff3c8
+Parent:     1e34a11d55c9437775367d72ad03f9af99e78bd0
+Author:     Reinette Chatre <reinette.chatre at intel.com>
+AuthorDate: Mon Jan 21 10:08:31 2008 -0800
+Committer:  David S. Miller <davem at davemloft.net>
+CommitDate: Wed Jan 23 03:11:41 2008 -0800
+
+    iwlwifi: fix possible read attempt on ucode that is not available
+    
+    This fixes a NULL pointer dereference that can occur when the
+    ucode is not loaded at the time __iwl_up is called.
+    
+    The problem was reported at http://kerneloops.org/raw.php?rawid=2765&msgid=
+    
+    Signed-off-by: Reinette Chatre <reinette.chatre at intel.com>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/iwlwifi/iwl3945-base.c |    5 +++++
+ drivers/net/wireless/iwlwifi/iwl4965-base.c |    5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
+index 1a6b0e0..0b3ec7e 100644
+--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
++++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
+@@ -6342,6 +6342,11 @@ static int __iwl_up(struct iwl_priv *priv)
+ 		return 0;
+ 	}
+ 
++	if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
++		IWL_ERROR("ucode not available for device bringup\n");
++		return -EIO;
++	}
++
+ 	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
+ 
+ 	rc = iwl_hw_nic_init(priv);
+diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
+index 6cd57c2..15a45f4 100644
+--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
++++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
+@@ -6698,6 +6698,11 @@ static int __iwl_up(struct iwl_priv *priv)
+ 		return 0;
+ 	}
+ 
++	if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
++		IWL_ERROR("ucode not available for device bringup\n");
++		return -EIO;
++	}
++
+ 	iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
+ 
+ 	rc = iwl_hw_nic_init(priv);


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.716
retrieving revision 1.717
diff -u -r1.716 -r1.717
--- sources	23 Jan 2008 20:37:52 -0000	1.716
+++ sources	24 Jan 2008 17:40:25 -0000	1.717
@@ -1,3 +1,3 @@
 2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
 527687c63f4252989dba6fb92baf9707  patch-2.6.24-rc8.bz2
-7b9870740b9fd71a14c9f5a2fdbee0e1  patch-2.6.24-rc8-git6.bz2
+58ca1752d0308507aa9759ca361683dc  patch-2.6.24-rc8-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -r1.638 -r1.639
--- upstream	23 Jan 2008 20:37:52 -0000	1.638
+++ upstream	24 Jan 2008 17:40:25 -0000	1.639
@@ -1,3 +1,3 @@
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc8.bz2
-patch-2.6.24-rc8-git6.bz2
+patch-2.6.24-rc8-git7.bz2


--- patch-2.6.24-rc8-git6.bz2.sign DELETED ---




More information about the fedora-extras-commits mailing list