From owner-p4-projects@FreeBSD.ORG  Fri Feb  9 12:53:19 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F44916A403; Fri,  9 Feb 2007 12:53:19 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F1AFF16A401
	for <perforce@FreeBSD.org>; Fri,  9 Feb 2007 12:53:18 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E2D0A13C441
	for <perforce@FreeBSD.org>; Fri,  9 Feb 2007 12:53:18 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l19CrIge004427
	for <perforce@FreeBSD.org>; Fri, 9 Feb 2007 12:53:18 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l19CrIZc004423
	for perforce@freebsd.org; Fri, 9 Feb 2007 12:53:18 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Fri, 9 Feb 2007 12:53:18 GMT
Message-Id: <200702091253.l19CrIZc004423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 114288 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Feb 2007 12:53:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=114288

Change 114288 by sephe@sephe_zealot:sam_wifi on 2007/02/09 12:52:33

	Avoid possible mbuf re-tap on error path.
	Obtained-from:	DragonFly

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#80 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#80 (text+ko) ====

@@ -139,7 +139,7 @@
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
-	int hdrspace;
+	int hdrspace, need_tap;
 	u_int8_t dir, type, subtype;
 	u_int8_t *bssid;
 	u_int16_t rxseq;
@@ -152,6 +152,7 @@
 		m_adj(m, -IEEE80211_CRC_LEN);
 		m->m_flags &= ~M_HASFCS;
 	}
+	need_tap = 1;			/* mbuf need to be tapped. */
 	type = -1;			/* undefined */
 	/*
 	 * In monitor mode, send everything directly to bpf.
@@ -427,6 +428,7 @@
 		/* copy to listener after decrypt */
 		if (bpf_peers_present(ic->ic_rawbpf))
 			bpf_mtap(ic->ic_rawbpf, m);
+		need_tap = 0;
 
 		/*
 		 * Finally, strip the 802.11 header.
@@ -588,7 +590,7 @@
 	ifp->if_ierrors++;
 out:
 	if (m != NULL) {
-		if (bpf_peers_present(ic->ic_rawbpf))
+		if (bpf_peers_present(ic->ic_rawbpf) && need_tap)
 			bpf_mtap(ic->ic_rawbpf, m);
 		m_freem(m);
 	}