From owner-svn-src-head@FreeBSD.ORG  Wed Sep 29 06:06:59 2010
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 37175106566B;
	Wed, 29 Sep 2010 06:06:59 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 261988FC15;
	Wed, 29 Sep 2010 06:06:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8T66x3C098069;
	Wed, 29 Sep 2010 06:06:59 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8T66xja098067;
	Wed, 29 Sep 2010 06:06:59 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201009290606.o8T66xja098067@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Wed, 29 Sep 2010 06:06:59 +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: r213257 - head/lib/libthr/thread
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: Wed, 29 Sep 2010 06:06:59 -0000

Author: davidxu
Date: Wed Sep 29 06:06:58 2010
New Revision: 213257
URL: http://svn.freebsd.org/changeset/base/213257

Log:
  Check invalid mutex in _mutex_cv_unlock.

Modified:
  head/lib/libthr/thread/thr_mutex.c

Modified: head/lib/libthr/thread/thr_mutex.c
==============================================================================
--- head/lib/libthr/thread/thr_mutex.c	Wed Sep 29 02:36:58 2010	(r213256)
+++ head/lib/libthr/thread/thr_mutex.c	Wed Sep 29 06:06:58 2010	(r213257)
@@ -636,6 +636,12 @@ _mutex_cv_unlock(pthread_mutex_t *mutex,
 	struct pthread_mutex *m;
 
 	m = *mutex;
+	if (__predict_false(m <= THR_MUTEX_DESTROYED)) {
+		if (m == THR_MUTEX_DESTROYED)
+			return (EINVAL);
+		return (EPERM);
+	}
+
 	/*
 	 * Check if the running thread is not the owner of the mutex.
 	 */