Messages in this thread | | | From | Bartlomiej Zolnierkiewicz <> | Subject | Re: hpt366 ptr use before NULL check. | Date | Sat, 4 Sep 2004 00:17:07 +0200 |
| |
bogus, hwif can't be NULL please remove checks instead
On Friday 03 September 2004 23:53, Dave Jones wrote: > On Fri, Sep 03, 2004 at 10:15:47PM +0100, Dave Jones wrote: > > Another picked up with the coverity checker. > > > > Signed-off-by: Dave Jones <davej@redhat.com> > > > > --- linux-2.6.8/drivers/ide/pci/hpt366.c~ 2004-09-03 22:13:46.870500672 +0100 > > +++ linux-2.6.8/drivers/ide/pci/hpt366.c 2004-09-03 22:14:53.095432952 +0100 > > @@ -773,13 +773,17 @@ > > static int hpt3xx_tristate (ide_drive_t * drive, int state) > > { > > ide_hwif_t *hwif = HWIF(drive); > > - struct pci_dev *dev = hwif->pci_dev; > > - u8 reg59h = 0, reset = (hwif->channel) ? 0x80 : 0x40; > > - u8 regXXh = 0, state_reg= (hwif->channel) ? 0x57 : 0x53; > > + struct pci_dev *dev; > > + u8 reg59h = 0, reset; > > + u8 regXXh = 0, state_reg; > > > > if (!hwif) > > return -EINVAL; > > > > + dev = hwif->pci_dev; > > + reset = (hwif->channel) ? 0x80 : 0x40; > > + state_reg = (hwif->channel) ? 0x57 : 0x53; > > + > > // hwif->bus_state = state; > > > > pci_read_config_byte(dev, 0x59, ®59h); > > Oops, missed one. > > Dave > > > --- linux-2.6.8/drivers/ide/pci/hpt366.c~ 2004-09-03 22:15:56.848740976 +0100 > +++ linux-2.6.8/drivers/ide/pci/hpt366.c 2004-09-03 22:16:33.470173672 +0100 > @@ -813,13 +813,14 @@ > static int hpt370_busproc(ide_drive_t * drive, int state) > { > ide_hwif_t *hwif = HWIF(drive); > - struct pci_dev *dev = hwif->pci_dev; > + struct pci_dev *dev; > u8 tristate = 0, resetmask = 0, bus_reg = 0; > u16 tri_reg; > > if (!hwif) > return -EINVAL; > > + dev = hwif->pci_dev; > hwif->bus_state = state; > > if (hwif->channel) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |