Skip to contentSkip to conversation

ide: add missing validity checks for identify words 62 and 63

PATCH In review Bartlomiej Zolnierkiewicz 1 participant 1 message Mar 10, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 12/13 ide: add missing validity checks for identify words 62 and 63

[PATCH] ide: add missing validity checks for identify words 62 and 63

Check validity of identify words 62 and 63 before using them in ide_get_mode_mask().

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---

 drivers/ide/ide-dma.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/ide/ide-dma.c +4 -2
Index: b/drivers/ide/ide-dma.c
===================================================================
@@ -731,10 +731,12 @@ static unsigned int ide_get_mode_mask(id
 			mask &= 0x07;
 		break;
 	case XFER_MW_DMA_0:
-		mask = id->dma_mword & hwif->mwdma_mask;
+		if (id->field_valid & 2)
+			mask = id->dma_mword & hwif->mwdma_mask;
 		break;
 	case XFER_SW_DMA_0:
-		mask = id->dma_1word & hwif->swdma_mask;
+		if (id->field_valid & 2)
+			mask = id->dma_1word & hwif->swdma_mask;
 		break;
 	default:
 		BUG();