rpms/kernel/F-9 patch-2.6.25.8.bz2.sign, NONE, 1.1 .cvsignore, 1.815, 1.816 kernel.spec, 1.687, 1.688 linux-2.6-upstream-reverts.patch, 1.4, 1.5 sources, 1.776, 1.777 upstream, 1.695, 1.696 patch-2.6.25.7.bz2.sign, 1.1, NONE

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5791

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.25.8.bz2.sign 
Removed Files:
	patch-2.6.25.7.bz2.sign 
Log Message:
* Mon Jun 23 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.8-69
- Linux 2.6.25.8
- Patches reverted from 2.6.25.8, already in Fedora:
    b43-fix-noise-calculation-warn_on.patch
    b43-fix-possible-null-pointer-dereference-in-dma-code.patch



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

iD8DBQBIXeOYyGugalF9Dw4RArSTAJ9vhtTeRp2Dkt1O9mySwMvhsmFXDgCfc9Be
IQzJFXR3ORyl+Q14QzBiHhE=
=wZJT
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -r1.815 -r1.816
--- .cvsignore	17 Jun 2008 02:17:41 -0000	1.815
+++ .cvsignore	23 Jun 2008 17:35:34 -0000	1.816
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.25
 linux-2.6.25.tar.bz2
-patch-2.6.25.7.bz2
+patch-2.6.25.8.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
--- kernel.spec	22 Jun 2008 07:50:52 -0000	1.687
+++ kernel.spec	23 Jun 2008 17:35:34 -0000	1.688
@@ -31,7 +31,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 7
+%define stable_update 8
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -1852,6 +1852,12 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 23 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.8-69
+- Linux 2.6.25.8
+- Patches reverted from 2.6.25.8, already in Fedora:
+    b43-fix-noise-calculation-warn_on.patch
+    b43-fix-possible-null-pointer-dereference-in-dma-code.patch
+
 * Sun Jun 22 2008 Dave Airlie <airlied at redhat.com> 2.6.25.7-68
 - update drm update to fix a bug.
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-upstream-reverts.patch	17 Jun 2008 02:17:41 -0000	1.4
+++ linux-2.6-upstream-reverts.patch	23 Jun 2008 17:35:34 -0000	1.5
@@ -326,3 +326,136 @@
  	return res;
  }
  
+From stable-bounces at linux.kernel.org Sat Jun 14 14:48:30 2008
+From: Michael Buesch <mb at bu3sch.de>
+Date: Sat, 14 Jun 2008 23:00:14 +0200
+Subject: b43: Fix noise calculation WARN_ON
+To: stable at kernel.org
+Cc: linux-wireless at vger.kernel.org, bcm43xx-dev at lists.berlios.de
+Message-ID: <200806142300.15391.mb at bu3sch.de>
+Content-Disposition: inline
+
+From: Michael Buesch <mb at bu3sch.de>
+
+commit 98a3b2fe435ae76170936c14f5c9e6a87548e3ef upstream.
+
+This removes a WARN_ON that is responsible for the following koops:
+http://www.kerneloops.org/searchweek.php?search=b43_generate_noise_sample
+
+The comment in the patch describes why it's safe to simply remove
+the check.
+
+Signed-off-by: Michael Buesch <mb at bu3sch.de>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+
+---
+ drivers/net/wireless/b43/b43.h  |    1 -
+ drivers/net/wireless/b43/main.c |   16 ++++++++++------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/b43/b43.h
++++ b/drivers/net/wireless/b43/b43.h
+@@ -596,7 +596,6 @@ struct b43_dma {
+ 
+ /* Context information for a noise calculation (Link Quality). */
+ struct b43_noise_calculation {
+-	u8 channel_at_start;
+ 	bool calculation_running;
+ 	u8 nr_samples;
+ 	s8 samples[8][4];
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -1027,7 +1027,6 @@ static void b43_generate_noise_sample(st
+ 	b43_jssi_write(dev, 0x7F7F7F7F);
+ 	b43_write32(dev, B43_MMIO_MACCMD,
+ 		    b43_read32(dev, B43_MMIO_MACCMD) | B43_MACCMD_BGNOISE);
+-	B43_WARN_ON(dev->noisecalc.channel_at_start != dev->phy.channel);
+ }
+ 
+ static void b43_calculate_link_quality(struct b43_wldev *dev)
+@@ -1036,7 +1035,6 @@ static void b43_calculate_link_quality(s
+ 
+ 	if (dev->noisecalc.calculation_running)
+ 		return;
+-	dev->noisecalc.channel_at_start = dev->phy.channel;
+ 	dev->noisecalc.calculation_running = 1;
+ 	dev->noisecalc.nr_samples = 0;
+ 
+@@ -1053,9 +1051,16 @@ static void handle_irq_noise(struct b43_
+ 
+ 	/* Bottom half of Link Quality calculation. */
+ 
++	/* Possible race condition: It might be possible that the user
++	 * changed to a different channel in the meantime since we
++	 * started the calculation. We ignore that fact, since it's
++	 * not really that much of a problem. The background noise is
++	 * an estimation only anyway. Slightly wrong results will get damped
++	 * by the averaging of the 8 sample rounds. Additionally the
++	 * value is shortlived. So it will be replaced by the next noise
++	 * calculation round soon. */
++
+ 	B43_WARN_ON(!dev->noisecalc.calculation_running);
+-	if (dev->noisecalc.channel_at_start != phy->channel)
+-		goto drop_calculation;
+ 	*((__le32 *)noise) = cpu_to_le32(b43_jssi_read(dev));
+ 	if (noise[0] == 0x7F || noise[1] == 0x7F ||
+ 	    noise[2] == 0x7F || noise[3] == 0x7F)
+@@ -1096,11 +1101,10 @@ static void handle_irq_noise(struct b43_
+ 			average -= 48;
+ 
+ 		dev->stats.link_noise = average;
+-	      drop_calculation:
+ 		dev->noisecalc.calculation_running = 0;
+ 		return;
+ 	}
+-      generate_new:
++generate_new:
+ 	b43_generate_noise_sample(dev);
+ }
+ 
+From stable-bounces at linux.kernel.org Sat Jun 14 14:46:55 2008
+From: Michael Buesch <mb at bu3sch.de>
+Date: Sat, 14 Jun 2008 22:57:55 +0200
+Subject: b43: Fix possible NULL pointer dereference in DMA code
+To: stable at kernel.org
+Cc: linux-wireless at vger.kernel.org, bcm43xx-dev at lists.berlios.de
+Message-ID: <200806142257.55946.mb at bu3sch.de>
+Content-Disposition: inline
+
+From: Michael Buesch <mb at bu3sch.de>
+
+a cut-down version of commit 028118a5f09a9c807e6b43e2231efdff9f224c74 upstream
+
+This fixes a possible NULL pointer dereference in an error path of the
+DMA allocation error checking code. In case the DMA allocation address is invalid,
+the dev pointer is dereferenced for unmapping of the buffer.
+
+Reported-by: Miles Lane <miles.lane at gmail.com>
+Signed-off-by: Michael Buesch <mb at bu3sch.de>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/wireless/b43/dma.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c
+@@ -850,6 +850,7 @@ struct b43_dmaring *b43_setup_dmaring(st
+ 	if (!ring)
+ 		goto out;
+ 	ring->type = type;
++	ring->dev = dev;
+ 
+ 	nr_slots = B43_RXRING_SLOTS;
+ 	if (for_tx)
+@@ -901,7 +902,6 @@ struct b43_dmaring *b43_setup_dmaring(st
+ 				 DMA_TO_DEVICE);
+ 	}
+ 
+-	ring->dev = dev;
+ 	ring->nr_slots = nr_slots;
+ 	ring->mmio_base = b43_dmacontroller_base(type, controller_index);
+ 	ring->index = controller_index;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -r1.776 -r1.777
--- sources	17 Jun 2008 02:17:41 -0000	1.776
+++ sources	23 Jun 2008 17:35:34 -0000	1.777
@@ -1,2 +1,2 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
-015b275011b48f716b3a6b072b18b471  patch-2.6.25.7.bz2
+007e6aca33604bc09687790361026d3c  patch-2.6.25.8.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- upstream	17 Jun 2008 02:17:41 -0000	1.695
+++ upstream	23 Jun 2008 17:35:34 -0000	1.696
@@ -1,2 +1,2 @@
 linux-2.6.25.tar.bz2
-patch-2.6.25.7.bz2
+patch-2.6.25.8.bz2


--- patch-2.6.25.7.bz2.sign DELETED ---