Commit 928ec5f148e729076e9202e7c78babede628a50c

Authored by Stefan Richter
1 parent 64549e9357

firewire: ohci: fix Self ID Count register mask (safeguard against buffer overflow)

The selfIDSize field of Self ID Count is 9 bits wide, and we are only
interested in the high 8 bits.  Fix the mask accordingly.  The
previously too large mask didn't do damage though because the next few
bits in the register are reserved and therefore zero with presently
existing hardware.

Also, check for the maximum possible self ID count of 252 (according to
OHCI 1.1 clause 11.2 and IEEE 1394a-2000 clause 4.3.4.1, i.e. up to four
self IDs of up to 63 nodes, even though IEEE 1394 up to edition 2008
defines only up to three self IDs per node).  More than 252 self IDs
would only happen if the self ID receive DMA unit malfunctioned, which
would likely be caught by other self ID buffer checks.  However, check
it early to be sure.  More than 253 quadlets would overflow the Topology
Map CSR.

Reported-By: PaX Team
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/firewire/ohci.c
... ... @@ -1279,8 +1279,8 @@
1279 1279 * the inverted quadlets and a header quadlet, we shift one
1280 1280 * bit extra to get the actual number of self IDs.
1281 1281 */
1282   - self_id_count = (reg >> 3) & 0x3ff;
1283   - if (self_id_count == 0) {
  1282 + self_id_count = (reg >> 3) & 0xff;
  1283 + if (self_id_count == 0 || self_id_count > 252) {
1284 1284 fw_notify("inconsistent self IDs\n");
1285 1285 return;
1286 1286 }