Merge tag 'ata-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

torvalds · torvalds · commit 2e5991fa39e4 · 2022-04-22T18:09:49.000-07:00
Pull ATA fix from Damien Le Moal:
 "A single fix to avoid a NULL pointer dereference in the pata_marvell
  driver with adapters not supporting DMA, from Zheyu"

* tag 'ata-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: pata_marvell: Check the 'bmdma_addr' beforing reading
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
@@ -77,6 +77,8 @@ static int marvell_cable_detect(struct ata_port *ap)
 	switch(ap->port_no)
 	{
 	case 0:
+		if (!ap->ioaddr.bmdma_addr)
+			return ATA_CBL_PATA_UNK;
 		if (ioread8(ap->ioaddr.bmdma_addr + 1) & 1)
 			return ATA_CBL_PATA40;
 		return ATA_CBL_PATA80;

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ static int marvell_cable_detect(struct ata_port *ap)`
`77`	`77`	`switch(ap->port_no)`
`78`	`78`	`{`
`79`	`79`	`case 0:`
	`80`	`+ if (!ap->ioaddr.bmdma_addr)`
	`81`	`+ return ATA_CBL_PATA_UNK;`
`80`	`82`	`if (ioread8(ap->ioaddr.bmdma_addr + 1) & 1)`
`81`	`83`	`return ATA_CBL_PATA40;`
`82`	`84`	`return ATA_CBL_PATA80;`