diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-12-24 02:45:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-12-24 02:45:34 +0000 |
| commit | 5c52b0beb6503713c8a44e3a72a39488315033dd (patch) | |
| tree | 36205830aaa9be0877f5d081fbbaebe96c4cd9e6 /sys/scsi/sd.c | |
| parent | 6dcaa262bc27b5670726959bb425bb0d3f9c7e9d (diff) | |
Have sd(4) devices check for and respect read-only information the
way st(4) does. Have both decline to open read-only devices for
anything but read-only access.
Suggestion to fail opens rather than individual i/o's from deraadt@.
Problem USB device found and donated by chefren, who also tested
diffs. Thanks!
ok dlg@ marco@
Diffstat (limited to 'sys/scsi/sd.c')
| -rw-r--r-- | sys/scsi/sd.c | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 74f6a87db2f..d83f33ff0d1 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.218 2010/09/24 01:41:34 dlg Exp $ */ +/* $OpenBSD: sd.c,v 1.219 2010/12/24 02:45:33 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -343,12 +343,17 @@ sdopen(dev_t dev, int flag, int fmt, struct proc *p) sc = sdlookup(unit); if (sc == NULL) return (ENXIO); + sc_link = sc->sc_link; + if (sc->flags & SDF_DYING) { device_unref(&sc->sc_dev); return (ENXIO); } + if (ISSET(flag, FWRITE) && ISSET(sc_link->flags, SDEV_READONLY)) { + device_unref(&sc->sc_dev); + return (EACCES); + } - sc_link = sc->sc_link; SC_DEBUG(sc_link, SDEV_DB1, ("sdopen: dev=0x%x (unit %d (of %d), partition %d)\n", dev, unit, sd_cd.cd_ndevs, part)); @@ -1403,21 +1408,37 @@ sd_get_parms(struct sd_softc *sc, struct disk_parms *dp, int flags) struct page_rigid_geometry *rigid = NULL; struct page_flex_geometry *flex = NULL; struct page_reduced_geometry *reduced = NULL; + u_char *page0 = NULL; u_int32_t heads = 0, sectors = 0, cyls = 0, secsize = 0, sssecsize; - int err = 0; + int err = 0, big; dp->disksize = scsi_size(sc->sc_link, flags, &sssecsize); + buf = malloc(sizeof(*buf), M_TEMP, M_NOWAIT); + if (buf == NULL) + goto validate; + + /* + * Ask for page 0 (vendor specific) mode sense data to find + * READONLY info. The only thing USB devices will ask for. + */ + err = scsi_do_mode_sense(sc->sc_link, 0, buf, (void **)&page0, + NULL, NULL, NULL, 1, flags | SCSI_SILENT, &big); + if (err == 0) { + if (big && buf->hdr_big.dev_spec & SMH_DSP_WRITE_PROT) + SET(sc->sc_link->flags, SDEV_READONLY); + else if (!big && buf->hdr.dev_spec & SMH_DSP_WRITE_PROT) + SET(sc->sc_link->flags, SDEV_READONLY); + else + CLR(sc->sc_link->flags, SDEV_READONLY); + } + /* * Many UMASS devices choke when asked about their geometry. Most * don't have a meaningful geometry anyway, so just fake it if * scsi_size() worked. */ if ((sc->sc_link->flags & SDEV_UMASS) && (dp->disksize > 0)) - goto validate; /* N.B. buf will be NULL at validate. */ - - buf = malloc(sizeof(*buf), M_TEMP, M_NOWAIT); - if (buf == NULL) goto validate; switch (sc->sc_link->inqdata.device & SID_TYPE) { |