From owner-svn-src-head@FreeBSD.ORG  Sun Jun 14 17:53:55 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9693B106566B;
	Sun, 14 Jun 2009 17:53:55 +0000 (UTC)
	(envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 849948FC22;
	Sun, 14 Jun 2009 17:53:55 +0000 (UTC)
	(envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5EHrtxa056035;
	Sun, 14 Jun 2009 17:53:55 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5EHrt9V056034;
	Sun, 14 Jun 2009 17:53:55 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <200906141753.n5EHrt9V056034@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sun, 14 Jun 2009 17:53:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194203 - head/sys/compat/linux
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 17:53:56 -0000

Author: dchagin
Date: Sun Jun 14 17:53:55 2009
New Revision: 194203
URL: http://svn.freebsd.org/changeset/base/194203

Log:
  Unlock process lock when return error from getrobustlist call.
  
  Tested by:	Alexander Best <alexbestms at math uni-muenster de>
  Approved by:	kib (mentor)
  MFC after:	3 days

Modified:
  head/sys/compat/linux/linux_futex.c

Modified: head/sys/compat/linux/linux_futex.c
==============================================================================
--- head/sys/compat/linux/linux_futex.c	Sun Jun 14 17:33:46 2009	(r194202)
+++ head/sys/compat/linux/linux_futex.c	Sun Jun 14 17:53:55 2009	(r194203)
@@ -707,8 +707,10 @@ linux_get_robust_list(struct thread *td,
 		/* XXX: ptrace? */
 		if (priv_check(td, PRIV_CRED_SETUID) || 
 		    priv_check(td, PRIV_CRED_SETEUID) ||
-		    p_candebug(td, p))
+		    p_candebug(td, p)) {
+			PROC_UNLOCK(p);
 			return (EPERM);
+		}
 		head = em->robust_futexes;
 		
 		PROC_UNLOCK(p);