diff options
| author |   jmatthew <jmatthew@openbsd.org> | 2018-03-30 07:18:39 +0000 |
|---|---|---|
| committer | jmatthew <jmatthew@openbsd.org> | 2018-03-30 07:18:39 +0000 |
| commit | 4b20f9301b819c65c47a3d66db9d3dcde627161d (patch) | |
| tree | 52416e995074c36ad8ac885e578de827e5073e1c /sys | |
| parent | include more information about how to create keys; (diff) | |
| download | wireguard-openbsd-4b20f9301b819c65c47a3d66db9d3dcde627161d.tar.xz wireguard-openbsd-4b20f9301b819c65c47a3d66db9d3dcde627161d.zip | |
Add some sensible error checking in the hibernate io path, helpfully
suggested by coverity (via daniel@)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_scsi.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c index 3060a76ffba..870d0d15da2 100644 --- a/sys/dev/sdmmc/sdmmc_scsi.c +++ b/sys/dev/sdmmc/sdmmc_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_scsi.c,v 1.41 2018/03/20 04:18:40 jmatthew Exp $ */ +/* $OpenBSD: sdmmc_scsi.c,v 1.42 2018/03/30 07:18:39 jmatthew Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -586,12 +586,16 @@ sdmmc_scsi_hibernate_io(dev_t dev, daddr_t blkno, vaddr_t addr, size_t size, case HIB_INIT: /* find device (sdmmc_softc, sdmmc_function) */ disk = disk_lookup(&sd_cd, DISKUNIT(dev)); + if (disk == NULL) + return (ENOTTY); + scsibus = disk->dv_parent; sdmmc = scsibus->dv_parent; chip = sdmmc->dv_parent; bus_sc = (struct scsibus_softc *)scsibus; scsi_sc = (struct sdmmc_scsi_softc *)scsibus; + sc = NULL; SLIST_FOREACH(link, &bus_sc->sc_link_list, bus_list) { if (link->device_softc == disk) { sc = (struct sdmmc_softc *)link->adapter_softc; @@ -599,6 +603,8 @@ sdmmc_scsi_hibernate_io(dev_t dev, daddr_t blkno, vaddr_t addr, size_t size, sf = scsi_sc->sc_tgt[link->target].card; } } + if (sc == NULL || sf == NULL) + return (ENOTTY); /* if the chipset doesn't do hibernate, bail out now */ sc = (struct sdmmc_softc *)sdmmc; @@ -641,8 +647,7 @@ sdmmc_scsi_hibernate_io(dev_t dev, daddr_t blkno, vaddr_t addr, size_t size, * bring the hardware state back into line with the real * softc by operating on the fake one */ - sdmmc_select_card(&state->sdmmc_sc, state->orig_sf); - return (0); + return (sdmmc_select_card(&state->sdmmc_sc, state->orig_sf)); } return (EINVAL); |