From owner-svn-src-head@FreeBSD.ORG  Thu Feb  7 21:22:14 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E9B146AA;
 Thu,  7 Feb 2013 21:22:14 +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 D5F91EC7;
 Thu,  7 Feb 2013 21:22:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r17LMELq010854;
 Thu, 7 Feb 2013 21:22:14 GMT
 (envelope-from monthadar@svn.freebsd.org)
Received: (from monthadar@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r17LMEkb010853;
 Thu, 7 Feb 2013 21:22:14 GMT
 (envelope-from monthadar@svn.freebsd.org)
Message-Id: <201302072122.r17LMEkb010853@svn.freebsd.org>
From: Monthadar Al Jaberi <monthadar@FreeBSD.org>
Date: Thu, 7 Feb 2013 21:22:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246504 - head/sys/net80211
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: Thu, 07 Feb 2013 21:22:15 -0000

Author: monthadar
Date: Thu Feb  7 21:22:14 2013
New Revision: 246504
URL: http://svnweb.freebsd.org/changeset/base/246504

Log:
  Start accepting IEEE80211_ACTION_MESH_GANN frames;
  
  * Add IEEE80211_ACTION_MESH_GANN Action frame verification in
    ieee80211_parse_action;
  
  Approved by:	adrian (mentor)

Modified:
  head/sys/net80211/ieee80211_input.c

Modified: head/sys/net80211/ieee80211_input.c
==============================================================================
--- head/sys/net80211/ieee80211_input.c	Thu Feb  7 21:21:40 2013	(r246503)
+++ head/sys/net80211/ieee80211_input.c	Thu Feb  7 21:22:14 2013	(r246504)
@@ -776,6 +776,10 @@ ieee80211_parse_action(struct ieee80211_
 			/* verify something */
 			break;
 		case IEEE80211_ACTION_MESH_GANN:
+			IEEE80211_VERIFY_LENGTH(efrm - frm,
+			    sizeof(struct ieee80211_meshgann_ie),
+			    return EINVAL);
+			break;
 		case IEEE80211_ACTION_MESH_CC:
 		case IEEE80211_ACTION_MESH_MCCA_SREQ:
 		case IEEE80211_ACTION_MESH_MCCA_SREP: