Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysctl_kern_proc_args: fix the deadlock (hi joerg!).

This commit is contained in:
rmind 2011-04-05 09:02:23 +00:00
parent 6297cc0d38
commit 223dbf13d7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_proc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_proc.c,v 1.173 2011/03/05 01:52:18 matt Exp $ */ /* $NetBSD: kern_proc.c,v 1.174 2011/04/05 09:02:23 rmind Exp $ */
/*- /*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.173 2011/03/05 01:52:18 matt Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.174 2011/04/05 09:02:23 rmind Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_kstack.h" #include "opt_kstack.h"
@ -1940,8 +1940,11 @@ sysctl_kern_proc_args(SYSCTLFN_ARGS)
goto out_locked; goto out_locked;
} }
rw_enter(&p->p_reflock, RW_READER); error = rw_tryenter(&p->p_reflock, RW_READER) ? 0 : EBUSY;
mutex_exit(p->p_lock); mutex_exit(p->p_lock);
if (error) {
goto out_locked;
}
mutex_exit(proc_lock); mutex_exit(proc_lock);
if (type == KERN_PROC_NARGV || type == KERN_PROC_NENV) { if (type == KERN_PROC_NARGV || type == KERN_PROC_NENV) {