From owner-svn-src-all@FreeBSD.ORG Mon Jan 17 20:22:03 2011 Return-Path: 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 80CDA106566B; Mon, 17 Jan 2011 20:22:03 +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 6B2F88FC0A; Mon, 17 Jan 2011 20:22:03 +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 p0HKM3VT011892; Mon, 17 Jan 2011 20:22:03 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HKM30o011890; Mon, 17 Jan 2011 20:22:03 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201101172022.p0HKM30o011890@svn.freebsd.org> From: Bernhard Schmidt Date: Mon, 17 Jan 2011 20:22:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217513 - stable/8/sys/dev/mwl 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2011 20:22:03 -0000 Author: bschmidt Date: Mon Jan 17 20:22:03 2011 New Revision: 217513 URL: http://svn.freebsd.org/changeset/base/217513 Log: MFC r216835: The mwl's HAL manages an array of MWL_MBSS_MAX VAPs where the first 8 are supposed to be APs and the later 24 are pre-configured as STAs. A wrong condition during initialization is responsible for not configuring the last 8 array members. This is results in being able to create more than 8, possible uninitialized, AP-VAPs. Submitted by: Erik Fonnesbeck Modified: stable/8/sys/dev/mwl/mwlhal.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/mwl/mwlhal.c ============================================================================== --- stable/8/sys/dev/mwl/mwlhal.c Mon Jan 17 20:19:35 2011 (r217512) +++ stable/8/sys/dev/mwl/mwlhal.c Mon Jan 17 20:22:03 2011 (r217513) @@ -279,7 +279,7 @@ mwl_hal_attach(device_t dev, uint16_t de hvap->vap_type = MWL_HAL_STA; hvap->bss_type = htole16(WL_MAC_TYPE_PRIMARY_CLIENT); hvap->macid = i; - for (i++; i < MWL_MBSS_STA_MAX; i++) { + for (i++; i < MWL_MBSS_MAX; i++) { hvap = &mh->mh_vaps[i]; hvap->vap_type = MWL_HAL_STA; hvap->bss_type = htole16(WL_MAC_TYPE_SECONDARY_CLIENT);