| From stefanr@s5r6.in-berlin.de Tue Nov 4 13:56:10 2008 |
| From: Jay Fenlason <fenlason@redhat.com> |
| Date: Mon, 27 Oct 2008 23:27:37 +0100 (CET) |
| Subject: firewire: Survive more than 256 bus resets |
| To: stable@kernel.org |
| Cc: linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org |
| Message-ID: <tkrat.6faab57f3da8f9b9@s5r6.in-berlin.de> |
| Content-Disposition: INLINE |
| |
| From: Jay Fenlason <fenlason@redhat.com> |
| |
| Same as commit 4f9740d4f5a17fa6a1b097fa3ccdfb7246660307 upstream |
| |
| The "color" is used during the topology building after a bus reset, |
| hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card |
| it is stored in an int. When the value wraps in one struct, but not |
| the other, disaster strikes. |
| |
| Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922 - |
| machine locks up solid if a series of bus resets occurs. |
| |
| |
| Signed-off-by: Jay Fenlason <fenlason@redhat.com> |
| Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/firewire/fw-transaction.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/firewire/fw-transaction.h |
| +++ b/drivers/firewire/fw-transaction.h |
| @@ -248,7 +248,7 @@ struct fw_card { |
| struct fw_node *local_node; |
| struct fw_node *root_node; |
| struct fw_node *irm_node; |
| - int color; |
| + u8 color; /* must be u8 to match the definition in struct fw_node */ |
| int gap_count; |
| bool beta_repeaters_present; |
| |
