CVS commit: [netbsd-6] src/sys/kern

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Sat May 11 21:43:06 UTC 2013

Modified Files:
        src/sys/kern [netbsd-6]: kern_drvctl.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #883):
        sys/kern/kern_drvctl.c: revision 1.34
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.32 -r1.32.8.1 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.32 src/sys/kern/kern_drvctl.c:1.32.8.1
--- src/sys/kern/kern_drvctl.c:1.32	Wed Aug 31 18:31:02 2011
+++ src/sys/kern/kern_drvctl.c	Sat May 11 21:43:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.32 2011/08/31 18:31:02 plunky Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.32.8.1 2013/05/11 21:43:06 riz Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.32 2011/08/31 18:31:02 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.32.8.1 2013/05/11 21:43:06 riz 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;
 	}