diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-31 17:35:36 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-31 17:35:36 +0000 |
| commit | d02aef79a06ee7a08196d8ca1add2d808a5be521 (patch) | |
| tree | 5d686c43ad652135252ea6e462befaf104dfb63f /sys/scsi | |
| parent | e6d59f8085bbfb29e0945b070307c616fdc3b6eb (diff) | |
Change a few of the more common disk drivers (sd, cd, wd, rd, and vnd)
to return EBUSY if the user tries to modify an open partition's offset
or size. Only sadness can result if a user tries this, and rejecting
it prevents a race between sdstart() and sdstrategy().
Curiously, there was already code in the kernel and in disklabel(8) to
detect/handle this, but it was effectively disabled because the disk
drivers always used something like "/* sc->sc_dk.dk_openmask */ 0",
and this commented out code has existed since even r1.1 in NetBSD.
I had no problems building a release and messing around with
disklabel(8) for a bit with this diff. Canarying the more common MI
disk drivers until we gain confidence that there aren't any
regressions, then we can switch the remaining drivers.
"I am surprised you got me convinced that this stuff is safe" deraadt@
ok krw@
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 4 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 24432963952..0325b93c54e 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.198 2011/03/17 21:30:24 deraadt Exp $ */ +/* $OpenBSD: cd.c,v 1.199 2011/05/31 17:35:35 matthew Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -884,7 +884,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) sc->sc_flags |= CDF_LABELLING; error = setdisklabel(sc->sc_dk.dk_label, - (struct disklabel *)addr, /*cd->sc_dk.dk_openmask : */0); + (struct disklabel *)addr, sc->sc_dk.dk_openmask); if (error == 0) { } diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 848d0a04a8c..03fd0487e2c 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.225 2011/04/08 10:37:39 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.226 2011/05/31 17:35:35 matthew Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -935,7 +935,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) sc->flags |= SDF_LABELLING; error = setdisklabel(sc->sc_dk.dk_label, - (struct disklabel *)addr, /*sd->sc_dk.dk_openmask : */0); + (struct disklabel *)addr, sc->sc_dk.dk_openmask); if (error == 0) { if (cmd == DIOCWDINFO) error = writedisklabel(DISKLABELDEV(dev), |