From owner-svn-src-head@FreeBSD.ORG  Tue Oct 19 16:48:50 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 32BB9106566C;
	Tue, 19 Oct 2010 16:48:50 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 216958FC13;
	Tue, 19 Oct 2010 16:48:50 +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 o9JGmobA020737;
	Tue, 19 Oct 2010 16:48:50 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9JGmoUZ020735;
	Tue, 19 Oct 2010 16:48:50 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201010191648.o9JGmoUZ020735@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Tue, 19 Oct 2010 16:48:50 +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: r214063 - head/sys/geom
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: Tue, 19 Oct 2010 16:48:50 -0000

Author: jh
Date: Tue Oct 19 16:48:49 2010
New Revision: 214063
URL: http://svn.freebsd.org/changeset/base/214063

Log:
  Use make_dev_p(9) with the MAKEDEV_CHECKNAME flag instead of make_dev(9)
  and print a diagnostic if the call fails.
  
  This avoids a panic when a device with an invalid name is attempted to
  be registered. For example the label class gets device names from
  untrusted input.
  
  Reviewed by:	freebsd-geom

Modified:
  head/sys/geom/geom_dev.c

Modified: head/sys/geom/geom_dev.c
==============================================================================
--- head/sys/geom/geom_dev.c	Tue Oct 19 16:06:00 2010	(r214062)
+++ head/sys/geom/geom_dev.c	Tue Oct 19 16:48:49 2010	(r214063)
@@ -126,8 +126,16 @@ g_dev_taste(struct g_class *mp, struct g
 	error = g_attach(cp, pp);
 	KASSERT(error == 0,
 	    ("g_dev_taste(%s) failed to g_attach, err=%d", pp->name, error));
-	dev = make_dev(&g_dev_cdevsw, 0,
-	    UID_ROOT, GID_OPERATOR, 0640, "%s", gp->name);
+	error = make_dev_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK, &dev,
+	    &g_dev_cdevsw, NULL, UID_ROOT, GID_OPERATOR, 0640, "%s", gp->name);
+	if (error != 0) {
+		printf("%s: make_dev_p() failed (gp->name=%s, error=%d)\n",
+		    __func__, gp->name, error);
+		g_detach(cp);
+		g_destroy_consumer(cp);
+		g_destroy_geom(gp);
+		return (NULL);
+	}
 	if (pp->flags & G_PF_CANDELETE)
 		dev->si_flags |= SI_CANDELETE;
 	dev->si_iosize_max = MAXPHYS;