Module Name: src
Committed By: msaitoh
Date: Fri Apr 26 09:04:44 UTC 2013
Modified Files:
src/sys/kern: kern_drvctl.c
Log Message:
Fix memory leak on the following cases when device attached or detached:
- No one open drvctl.
- kmem_alloc() failed in devmon_insert().
XXX pullup to both netbsd-5 and netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_drvctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.33 src/sys/kern/kern_drvctl.c:1.34
--- src/sys/kern/kern_drvctl.c:1.33 Sat Oct 27 17:18:39 2012
+++ src/sys/kern/kern_drvctl.c Fri Apr 26 09:04:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.33 2012/10/27 17:18:39 chs Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.34 2013/04/26 09:04:43 msaitoh Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.33 2012/10/27 17:18:39 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.34 2013/04/26 09:04:43 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,6 +115,7 @@ devmon_insert(const char *event, prop_di
mutex_enter(&drvctl_lock);
if (drvctl_nopen == 0) {
+ prop_object_release(ev);
mutex_exit(&drvctl_lock);
return;
}
@@ -128,6 +129,7 @@ devmon_insert(const char *event, prop_di
dce = kmem_alloc(sizeof(*dce), KM_SLEEP);
if (dce == NULL) {
+ prop_object_release(ev);
mutex_exit(&drvctl_lock);
return;
}
