From owner-svn-src-head@FreeBSD.ORG  Tue Dec 18 08:44:59 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C6099E1D;
 Tue, 18 Dec 2012 08:44:59 +0000 (UTC)
 (envelope-from monthadar@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 AA8C98FC0C;
 Tue, 18 Dec 2012 08:44:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI8ix62097634;
 Tue, 18 Dec 2012 08:44:59 GMT
 (envelope-from monthadar@svn.freebsd.org)
Received: (from monthadar@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI8ixdX097633;
 Tue, 18 Dec 2012 08:44:59 GMT
 (envelope-from monthadar@svn.freebsd.org)
Message-Id: <201212180844.qBI8ixdX097633@svn.freebsd.org>
From: Monthadar Al Jaberi <monthadar@FreeBSD.org>
Date: Tue, 18 Dec 2012 08:44:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244389 - head/sys/dev/wtap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 18 Dec 2012 08:44:59 -0000

Author: monthadar
Date: Tue Dec 18 08:44:59 2012
New Revision: 244389
URL: http://svnweb.freebsd.org/changeset/base/244389

Log:
  wtap should check if ieee80211_vap_setup fails.
  
  * If ieee80211_vap_setup fails, we free allocated M_80211_VAP
    memory and return NULL;
  
  Approved by: adrian (mentor)

Modified:
  head/sys/dev/wtap/if_wtap.c

Modified: head/sys/dev/wtap/if_wtap.c
==============================================================================
--- head/sys/dev/wtap/if_wtap.c	Tue Dec 18 08:41:23 2012	(r244388)
+++ head/sys/dev/wtap/if_wtap.c	Tue Dec 18 08:44:59 2012	(r244389)
@@ -334,6 +334,10 @@ wtap_vap_create(struct ieee80211com *ic,
 	vap = (struct ieee80211vap *) avp;
 	error = ieee80211_vap_setup(ic, vap, name, unit, IEEE80211_M_MBSS,
 	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+	if (error) {
+		free((struct wtap_vap*) vap, M_80211_VAP);
+		return NULL;
+	}
 
 	/* override various methods */
 	avp->av_recv_mgmt = vap->iv_recv_mgmt;