diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-12-14 20:23:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-12-14 20:23:16 +0000 |
| commit | a667be70136c6899a3edcffa0d282ad70f66090d (patch) | |
| tree | ce6434d721d686b9c05c85a8a9a84dba7d745696 | |
| parent | 0d0ca081a91d670c354dd808865d61af95d43c04 (diff) | |
Don't bother using DETACH_FORCE for the softraid luns at reboot
time; the aggressive mountpoint destruction seems to hit insane
use-after-frees when we are already far on the way down.
| -rw-r--r-- | sys/dev/softraid.c | 21 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 6 |
2 files changed, 14 insertions, 13 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index dcc4db16864..aa1d001e5ad 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.385 2017/09/06 21:08:01 patrick Exp $ */ +/* $OpenBSD: softraid.c,v 1.386 2017/12/14 20:23:13 deraadt Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -118,7 +118,7 @@ int sr_ioctl_installboot(struct sr_softc *, void sr_chunks_unwind(struct sr_softc *, struct sr_chunk_head *); void sr_discipline_free(struct sr_discipline *); -void sr_discipline_shutdown(struct sr_discipline *, int); +void sr_discipline_shutdown(struct sr_discipline *, int, int); int sr_discipline_init(struct sr_discipline *, int); int sr_alloc_resources(struct sr_discipline *); void sr_free_resources(struct sr_discipline *); @@ -126,7 +126,7 @@ void sr_set_chunk_state(struct sr_discipline *, int, int); void sr_set_vol_state(struct sr_discipline *); /* utility functions */ -void sr_shutdown(void); +void sr_shutdown(int); void sr_uuid_generate(struct sr_uuid *); char *sr_uuid_format(struct sr_uuid *); void sr_uuid_print(struct sr_uuid *, int); @@ -1836,7 +1836,7 @@ sr_detach(struct device *self, int flags) softraid_disk_attach = NULL; - sr_shutdown(); + sr_shutdown(0); #ifndef SMALL_KERNEL if (sc->sc_sensor_task != NULL) @@ -3597,7 +3597,7 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, unwind: free(dt, M_DEVBUF, bc->bc_dev_list_len); - sr_discipline_shutdown(sd, 0); + sr_discipline_shutdown(sd, 0, 0); if (rv == EAGAIN) rv = 0; @@ -3628,7 +3628,7 @@ sr_ioctl_deleteraid(struct sr_softc *sc, struct sr_discipline *sd, sd->sd_deleted = 1; sd->sd_meta->ssdi.ssd_vol_flags = BIOC_SCNOAUTOASSEMBLE; - sr_discipline_shutdown(sd, 1); + sr_discipline_shutdown(sd, 1, 0); rv = 0; bad: @@ -3890,7 +3890,7 @@ sr_discipline_free(struct sr_discipline *sd) } void -sr_discipline_shutdown(struct sr_discipline *sd, int meta_save) +sr_discipline_shutdown(struct sr_discipline *sd, int meta_save, int dying) { struct sr_softc *sc; int s; @@ -3928,7 +3928,8 @@ sr_discipline_shutdown(struct sr_discipline *sd, int meta_save) #endif /* SMALL_KERNEL */ if (sd->sd_target != 0) - scsi_detach_lun(sc->sc_scsibus, sd->sd_target, 0, DETACH_FORCE); + scsi_detach_lun(sc->sc_scsibus, sd->sd_target, 0, + dying ? 0 : DETACH_FORCE); sr_chunks_unwind(sc, &sd->sd_vol.sv_chunk_list); @@ -4535,7 +4536,7 @@ sr_validate_stripsize(u_int32_t b) } void -sr_shutdown(void) +sr_shutdown(int dying) { struct sr_softc *sc = softraid0; struct sr_discipline *sd; @@ -4551,7 +4552,7 @@ sr_shutdown(void) /* Shutdown disciplines in reverse attach order. */ while ((sd = TAILQ_LAST(&sc->sc_dis_list, sr_discipline_list)) != NULL) - sr_discipline_shutdown(sd, 1); + sr_discipline_shutdown(sd, 1, dying); } int diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index da17524a115..7311916fbf5 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.264 2017/12/14 20:20:38 deraadt Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.265 2017/12/14 20:23:15 deraadt Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -72,7 +72,7 @@ #include "softraid.h" -void sr_shutdown(void); +void sr_shutdown(int); enum vtype iftovt_tab[16] = { VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON, @@ -1657,7 +1657,7 @@ vfs_shutdown(struct proc *p) printf("done\n"); #if NSOFTRAID > 0 - sr_shutdown(); + sr_shutdown(1); #endif } |