diff options
| author |   Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-03-19 22:05:02 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-04-18 17:55:34 +0200 |
| commit | 016bf3dfcf7c7fbad8f02e72b6e01d6773426f9d (patch) | |
| tree | 844a04d866b5b0d5eccdb795ad7e6c9fc79f3f2c /drivers/firewire | |
| parent | firewire: fw-ohci: add self ID error check (diff) | |
| download | linux-dev-016bf3dfcf7c7fbad8f02e72b6e01d6773426f9d.tar.xz linux-dev-016bf3dfcf7c7fbad8f02e72b6e01d6773426f9d.zip | |
firewire: fw-ohci: catch self_id_count == 0
fw_core_handle_bus_reset() incorrectly relied on the assumption that
self_id_count > 0.
We check early in fw-ohci and discard the self ID complete event if
self_id_count == 0 because a valid event always has at least one self ID
packet in it (the one of the local node). Hence treat self_id_count ==
0 like any other kind of invalid self ID buffer.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jarod Wilson <jwilson@redhat.com>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 1f6f15f0dce2..0c4a07f11a59 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c @@ -1031,6 +1031,10 @@ static void bus_reset_tasklet(unsigned long data) * bit extra to get the actual number of self IDs. */ self_id_count = (reg >> 3) & 0x3ff; + if (self_id_count == 0) { + fw_notify("inconsistent self IDs\n"); + return; + } generation = (cond_le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff; rmb(); |