From owner-svn-src-head@FreeBSD.ORG  Sat Jul 30 14:12:37 2011
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 AACCD106566C;
	Sat, 30 Jul 2011 14:12:37 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A1DF8FC13;
	Sat, 30 Jul 2011 14:12:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6UECblV003299;
	Sat, 30 Jul 2011 14:12:37 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6UECbXe003297;
	Sat, 30 Jul 2011 14:12:37 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201107301412.p6UECbXe003297@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 30 Jul 2011 14:12:37 +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: r224521 - head/sys/kern
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: Sat, 30 Jul 2011 14:12:37 -0000

Author: kib
Date: Sat Jul 30 14:12:37 2011
New Revision: 224521
URL: http://svn.freebsd.org/changeset/base/224521

Log:
  Fix the devmtx lock leak from make_dev(9) when the old device cloning
  failed due to invalid or duplicated path being generated.
  
  Reviewed by:	jh
  Approved by:	re (kensmith)
  MFC after:	1 week

Modified:
  head/sys/kern/kern_conf.c

Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c	Sat Jul 30 13:46:41 2011	(r224520)
+++ head/sys/kern/kern_conf.c	Sat Jul 30 14:12:37 2011	(r224521)
@@ -764,7 +764,8 @@ make_dev_credv(int flags, struct cdev **
 				LIST_REMOVE(dev, si_list);
 				dev_unlock();
 				devfs_free(dev);
-			}
+			} else
+				dev_unlock();
 			return (res);
 		}
 	}