From owner-svn-src-head@FreeBSD.ORG  Sun Aug 25 10:04:10 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CB505415;
 Sun, 25 Aug 2013 10:04:10 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B88D024F4;
 Sun, 25 Aug 2013 10:04:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7PA4ALF091199;
 Sun, 25 Aug 2013 10:04:10 GMT
 (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7PA4Ad2091198;
 Sun, 25 Aug 2013 10:04:10 GMT
 (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201308251004.r7PA4Ad2091198@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sun, 25 Aug 2013 10:04:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254838 - head/sys/dev/drm2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 25 Aug 2013 10:04:10 -0000

Author: dumbbell
Date: Sun Aug 25 10:04:10 2013
New Revision: 254838
URL: http://svnweb.freebsd.org/changeset/base/254838

Log:
  drm: In drm_gem_name_create(), verify argument before acquiring lock
  
  Submitted by:	J.R. Oldroyd <jr@opal.com>

Modified:
  head/sys/dev/drm2/drm_gem_names.c

Modified: head/sys/dev/drm2/drm_gem_names.c
==============================================================================
--- head/sys/dev/drm2/drm_gem_names.c	Sun Aug 25 10:01:59 2013	(r254837)
+++ head/sys/dev/drm2/drm_gem_names.c	Sun Aug 25 10:04:10 2013	(r254838)
@@ -132,12 +132,12 @@ drm_gem_name_create(struct drm_gem_names
 {
 	struct drm_gem_name *np;
 
-	np = malloc(sizeof(struct drm_gem_name), M_GEM_NAMES, M_WAITOK);
-	mtx_lock(&names->lock);
 	if (*name != 0) {
-		mtx_unlock(&names->lock);
 		return (EALREADY);
 	}
+
+	np = malloc(sizeof(struct drm_gem_name), M_GEM_NAMES, M_WAITOK);
+	mtx_lock(&names->lock);
 	np->name = alloc_unr(names->unr);
 	if (np->name == -1) {
 		mtx_unlock(&names->lock);