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

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Wed Jun 19 07:55:44 UTC 2013

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

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1859):
        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().


To generate a diff of this commit:
cvs rdiff -u -r1.19.6.3 -r1.19.6.4 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.19.6.3 src/sys/kern/kern_drvctl.c:1.19.6.4
--- src/sys/kern/kern_drvctl.c:1.19.6.3	Sun May  3 22:39:49 2009
+++ src/sys/kern/kern_drvctl.c	Wed Jun 19 07:55:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.19.6.3 2009/05/03 22:39:49 snj Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.19.6.4 2013/06/19 07:55:44 bouyer Exp $ */
 
 /*
  * Copyright (c) 2004
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.19.6.3 2009/05/03 22:39:49 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.19.6.4 2013/06/19 07:55:44 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -112,6 +112,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;
 	}
@@ -125,6 +126,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;
 	}