From owner-svn-src-projects@FreeBSD.ORG  Fri Jul 10 11:02:31 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9120F106567A;
	Fri, 10 Jul 2009 11:02:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 802D58FC13;
	Fri, 10 Jul 2009 11:02:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6AB2VoP018069;
	Fri, 10 Jul 2009 11:02:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6AB2VF5018067;
	Fri, 10 Jul 2009 11:02:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907101102.n6AB2VF5018067@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 10 Jul 2009 11:02:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195543 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jul 2009 11:02:31 -0000

Author: rpaulo
Date: Fri Jul 10 11:02:31 2009
New Revision: 195543
URL: http://svn.freebsd.org/changeset/base/195543

Log:
  mesh_verify_meshpeerver(): verify len
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:00:52 2009	(r195542)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul 10 11:02:31 2009	(r195543)
@@ -2052,7 +2052,9 @@ mesh_verify_meshpeerver(struct ieee80211
 	const struct ieee80211_meshpeerver_ie *meshpeerver =
 	    (const struct ieee80211_meshpeerver_ie *) ie;
 
-	/* XXX verify length */
+	if (meshpeerver->peerver_len !=
+	    sizeof(struct ieee80211_meshpeerver_ie) - 2)
+		return 1;
 	return memcmp(meshpeerver->peerver_proto, peer, 4);
 }