Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get out of cgd_detach() early on error. Do not call disk_destroy(9) 

on error, that leaves the cgd_softc in an inconsistent state.

Fixes a crash during shutdown reported by Patrick Welche.  Thanks
to Patrick for reporting and for testing the fix.
This commit is contained in:
dyoung 2010-01-20 18:55:17 +00:00
parent d03b2461a3
commit c95d6a20b9
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/cgd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgd.c,v 1.66 2010/01/12 23:49:34 dyoung Exp $ */ /* $NetBSD: cgd.c,v 1.67 2010/01/20 18:55:17 dyoung Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.66 2010/01/12 23:49:34 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.67 2010/01/20 18:55:17 dyoung Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -193,23 +193,21 @@ cgd_attach(device_t parent, device_t self, void *aux)
static int static int
cgd_detach(device_t self, int flags) cgd_detach(device_t self, int flags)
{ {
int ret = 0; int ret;
int pmask = 1 << RAW_PART; const int pmask = 1 << RAW_PART;
struct cgd_softc *sc = device_private(self); struct cgd_softc *sc = device_private(self);
struct dk_softc *dksc; struct dk_softc *dksc = &sc->sc_dksc;
dksc = &sc->sc_dksc; if (DK_BUSY(dksc, pmask))
if ((dksc->sc_flags & DKF_INITED) != 0) return EBUSY;
{
if (DK_BUSY(&sc->sc_dksc, pmask))
ret = EBUSY;
else
ret = cgd_ioctl_clr(sc, curlwp);
}
disk_destroy(&sc->sc_dksc.sc_dkdev); if ((dksc->sc_flags & DKF_INITED) != 0 &&
(ret = cgd_ioctl_clr(sc, curlwp)) != 0)
return ret;
return ret; disk_destroy(&dksc->sc_dkdev);
return 0;
} }
void void