From owner-svn-src-stable@FreeBSD.ORG  Tue Oct  7 13:47:55 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 85C3A617;
 Tue,  7 Oct 2014 13:47:55 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 71A5219E;
 Tue,  7 Oct 2014 13:47:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97DltEk097254;
 Tue, 7 Oct 2014 13:47:55 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97DltjJ097253;
 Tue, 7 Oct 2014 13:47:55 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201410071347.s97DltjJ097253@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 7 Oct 2014 13:47:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r272699 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Oct 2014 13:47:55 -0000

Author: avg
Date: Tue Oct  7 13:47:54 2014
New Revision: 272699
URL: https://svnweb.freebsd.org/changeset/base/272699

Log:
  MFC r235978: device_add_child: protect against child device with no
  driver but fixed unit number

Modified:
  stable/9/sys/kern/subr_bus.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/subr_bus.c
==============================================================================
--- stable/9/sys/kern/subr_bus.c	Tue Oct  7 13:42:34 2014	(r272698)
+++ stable/9/sys/kern/subr_bus.c	Tue Oct  7 13:47:54 2014	(r272699)
@@ -1812,6 +1812,8 @@ device_add_child_ordered(device_t dev, u
 
 	PDEBUG(("%s at %s with order %u as unit %d",
 	    name, DEVICENAME(dev), order, unit));
+	KASSERT(name != NULL || unit == -1,
+	    ("child device with wildcard name and specific unit number"));
 
 	child = make_device(dev, name, unit);
 	if (child == NULL)