From owner-svn-src-all@FreeBSD.ORG  Sat Apr 13 05:11:21 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C54DB6C2;
 Sat, 13 Apr 2013 05:11:21 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B8263F7B;
 Sat, 13 Apr 2013 05:11:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3D5BLUD003363;
 Sat, 13 Apr 2013 05:11:21 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3D5BLjp003362;
 Sat, 13 Apr 2013 05:11:21 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201304130511.r3D5BLjp003362@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 13 Apr 2013 05:11:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249435 - head/sys/amd64/vmm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Apr 2013 05:11:21 -0000

Author: neel
Date: Sat Apr 13 05:11:21 2013
New Revision: 249435
URL: http://svnweb.freebsd.org/changeset/base/249435

Log:
  Use the MAKEDEV_CHECKNAME flag to check for an invalid device name and return
  an error instead of panicking.
  
  Obtained from:	NetApp

Modified:
  head/sys/amd64/vmm/vmm_dev.c

Modified: head/sys/amd64/vmm/vmm_dev.c
==============================================================================
--- head/sys/amd64/vmm/vmm_dev.c	Sat Apr 13 02:15:59 2013	(r249434)
+++ head/sys/amd64/vmm/vmm_dev.c	Sat Apr 13 05:11:21 2013	(r249435)
@@ -497,8 +497,12 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS)
 		return (EEXIST);
 	}
 
-	sc->cdev = make_dev(&vmmdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-			    "vmm/%s", buf);
+	error = make_dev_p(MAKEDEV_CHECKNAME, &sc->cdev, &vmmdevsw, NULL,
+			   UID_ROOT, GID_WHEEL, 0600, "vmm/%s", buf);
+	if (error != 0) {
+		vmmdev_destroy(sc, TRUE);
+		return (error);
+	}
 	sc->cdev->si_drv1 = sc;
 
 	return (0);