[src/netbsd-6-0]: src/sys/miscfs/procfs Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/928014f3740b
branches:  netbsd-6-0
changeset: 774832:928014f3740b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Jul 29 08:24:09 2013 +0000

description:
Pull up following revision(s) (requested by ryo in ticket #917):
        sys/miscfs/procfs/procfs_map.c: revision 1.43
PR/48048: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM
error case in procfs_domap()d

diffstat:

 sys/miscfs/procfs/procfs_map.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 685ed5e600f8 -r 928014f3740b sys/miscfs/procfs/procfs_map.c
--- a/sys/miscfs/procfs/procfs_map.c    Mon Jul 29 07:10:33 2013 +0000
+++ b/sys/miscfs/procfs/procfs_map.c    Mon Jul 29 08:24:09 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $  */
+/*     $NetBSD: procfs_map.c,v 1.41.12.1 2013/07/29 08:24:09 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1993
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.41 2011/10/16 12:26:16 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.41.12.1 2013/07/29 08:24:09 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -207,6 +207,8 @@
                        bufsize <<= 1;
                        if (bufsize > MAXBUFFERSIZE) {
                                error = ENOMEM;
+                               vm_map_unlock_read(map);
+                               uvmspace_free(vm);
                                goto out;
                        }
                        free(buffer, M_TEMP);