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

Don't destroy locked mutex. Don't access freed memory.

This commit is contained in:
joerg 2014-04-06 00:56:39 +00:00
parent 07ddce23e3
commit 552522025c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ccd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccd.c,v 1.147 2014/02/25 18:30:09 pooka Exp $ */
/* $NetBSD: ccd.c,v 1.148 2014/04/06 00:56:39 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.147 2014/02/25 18:30:09 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.148 2014/04/06 00:56:39 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -231,6 +231,7 @@ ccdcreate(int unit) {
static void
ccddestroy(struct ccd_softc *sc) {
mutex_obj_free(sc->sc_iolock);
mutex_exit(&sc->sc_dvlock);
mutex_destroy(&sc->sc_dvlock);
cv_destroy(&sc->sc_stop);
cv_destroy(&sc->sc_push);
@ -1271,7 +1272,8 @@ ccdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
disk_detach(&cs->sc_dkdev);
bufq_free(cs->sc_bufq);
ccdput(cs);
break;
/* Don't break, otherwise cs is read again. */
return 0;
case DIOCGDINFO:
*(struct disklabel *)data = *(cs->sc_dkdev.dk_label);