rpms/kernel/devel kernel.spec, 1.530, 1.531 linux-2.6-firewire-git-pending.patch, 1.21, 1.22

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Mon Mar 24 17:55:19 UTC 2008


Author: jwilson

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

Modified Files:
	kernel.spec linux-2.6-firewire-git-pending.patch 
Log Message:
* Mon Mar 24 2008 Jarod Wilson <jwilson at redhat.com>
- firewire not totally merged yet, fix up patch accordingly



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- kernel.spec	24 Mar 2008 17:34:04 -0000	1.530
+++ kernel.spec	24 Mar 2008 17:54:13 -0000	1.531
@@ -1129,7 +1129,6 @@
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-C=0
 if [ "$C" -gt 10 ]; then
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
@@ -1735,6 +1734,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Mar 24 2008 Jarod Wilson <jwilson at redhat.com>
+- firewire not totally merged yet, fix up patch accordingly
+
 * Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>
 - wireless & firewire were merged.
 

linux-2.6-firewire-git-pending.patch:

Index: linux-2.6-firewire-git-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-git-pending.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- linux-2.6-firewire-git-pending.patch	22 Mar 2008 03:32:29 -0000	1.21
+++ linux-2.6-firewire-git-pending.patch	24 Mar 2008 17:54:13 -0000	1.22
@@ -394,53 +394,6 @@
 
 
 
-Date: Sun, 16 Mar 2008 00:56:41 +0100 (CET)
-From: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Subject: [PATCH] firewire: fix panic in handle_at_packet
-To: linux1394-devel at lists.sourceforge.net
-cc: linux-kernel at vger.kernel.org,
- Johannes Berg <johannes at sipsolutions.net>,
- Jarod Wilson <jwilson at redhat.com>
-
-This fixes a use-after-free bug in the handling of split transactions.
-The AT DMA handler of the request was occasionally executed after the
-AR DMA handler of the response.  The AT DMA handler then accessed an
-already freed packet.
-
-Reported by Johannes Berg <johannes at sipsolutions.net>.
-http://bugzilla.kernel.org/show_bug.cgi?id=9617
-
-Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-Signed-off-by: Jarod Wilson <jwilson at redhat.com>
----
- drivers/firewire/fw-transaction.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: linux/drivers/firewire/fw-transaction.c
-===================================================================
---- linux.orig/drivers/firewire/fw-transaction.c
-+++ linux/drivers/firewire/fw-transaction.c
-@@ -737,6 +737,12 @@ fw_core_handle_response(struct fw_card *
- 		break;
- 	}
- 
-+	/*
-+	 * The response handler may be executed while the request handler
-+	 * is still pending.  Cancel the request handler.
-+	 */
-+	card->driver->cancel_packet(card, &t->packet);
-+
- 	t->callback(card, rcode, data, data_length, t->callback_data);
- }
- EXPORT_SYMBOL(fw_core_handle_response);
-
--- 
-Stefan Richter
--=====-==--- --== =----
-http://arcgraph.de/sr/
-
-
-
 Date: Thu, 20 Mar 2008 22:04:36 +0100 (CET)
 From: Stefan Richter <stefanr at s5r6.in-berlin.de>
 Subject: [PATCH] firewire: debug interrupt events




More information about the fedora-extras-commits mailing list