[src/netbsd-6]: src/sys/kern Pull up following revision(s) (requested by msai...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cbf5febd8dcb
branches:  netbsd-6
changeset: 775783:cbf5febd8dcb
user:      riz <riz%NetBSD.org@localhost>
date:      Sat May 11 21:43:06 2013 +0000

description:
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.

diffstat:

 sys/kern/kern_drvctl.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 5740766ff92d -r cbf5febd8dcb sys/kern/kern_drvctl.c
--- a/sys/kern/kern_drvctl.c    Sat May 11 21:39:16 2013 +0000
+++ b/sys/kern/kern_drvctl.c    Sat May 11 21:43:06 2013 +0000
@@ -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 @@
        mutex_enter(&drvctl_lock);
 
        if (drvctl_nopen == 0) {
+               prop_object_release(ev);
                mutex_exit(&drvctl_lock);
                return;
        }
@@ -128,6 +129,7 @@
 
        dce = kmem_alloc(sizeof(*dce), KM_SLEEP);
        if (dce == NULL) {
+               prop_object_release(ev);
                mutex_exit(&drvctl_lock);
                return;
        }