From owner-svn-src-all@FreeBSD.ORG  Mon Nov 29 10:10:56 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC9A11065675;
	Mon, 29 Nov 2010 10:10:56 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CAB738FC15;
	Mon, 29 Nov 2010 10:10:56 +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 oATAAuHV023382;
	Mon, 29 Nov 2010 10:10:56 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oATAAuAW023380;
	Mon, 29 Nov 2010 10:10:56 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201011291010.oATAAuAW023380@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Mon, 29 Nov 2010 10:10:56 +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: r216049 - head/sys/compat/ndis
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 29 Nov 2010 10:10:57 -0000

Author: bschmidt
Date: Mon Nov 29 10:10:56 2010
New Revision: 216049
URL: http://svn.freebsd.org/changeset/base/216049

Log:
  Some drivers rely on the existence of certain keys. The Atheros 9xxx
  driver for example requests the NetCfgInstanceId but doesn't check the
  returned status code and will happily access random memory instead.
  
  Submitted by:	Paul B Mahol <onemda at gmail.com>
  MFC after:	2 weeks

Modified:
  head/sys/compat/ndis/kern_ndis.c

Modified: head/sys/compat/ndis/kern_ndis.c
==============================================================================
--- head/sys/compat/ndis/kern_ndis.c	Mon Nov 29 09:24:03 2010	(r216048)
+++ head/sys/compat/ndis/kern_ndis.c	Mon Nov 29 10:10:56 2010	(r216049)
@@ -331,6 +331,16 @@ ndis_create_sysctls(arg)
 	ndis_add_sysctl(sc, "NdisVersion",
 	    "NDIS API Version", "0x00050001", CTLFLAG_RD);
 
+	/*
+	 * Some miniport drivers rely on the existence of the SlotNumber,
+	 * NetCfgInstanceId and DriverDesc keys.
+	 */
+	ndis_add_sysctl(sc, "SlotNumber", "Slot Numer", "01", CTLFLAG_RD);
+	ndis_add_sysctl(sc, "NetCfgInstanceId", "NetCfgInstanceId",
+	    "{12345678-1234-5678-CAFE0-123456789ABC}", CTLFLAG_RD);
+	ndis_add_sysctl(sc, "DriverDesc", "Driver Description",
+	    "NDIS Network Adapter", CTLFLAG_RD);
+
 	/* Bus type (PCI, PCMCIA, etc...) */
 	sprintf(buf, "%d", (int)sc->ndis_iftype);
 	ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);