From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 10:43:20 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 AE0851065670;
	Mon,  8 Jun 2009 10:43:20 +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 9D6548FC16;
	Mon,  8 Jun 2009 10:43:20 +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 n58AhKQZ026959;
	Mon, 8 Jun 2009 10:43:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58AhKYE026958;
	Mon, 8 Jun 2009 10:43:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081043.n58AhKYE026958@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 10:43:20 +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: r193701 - 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: Mon, 08 Jun 2009 10:43:20 -0000

Author: rpaulo
Date: Mon Jun  8 10:43:20 2009
New Revision: 193701
URL: http://svn.freebsd.org/changeset/base/193701

Log:
  Initialize i_len and return ENOMEM if len is bigger than i_len.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Mon Jun  8 10:05:05 2009	(r193700)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Mon Jun  8 10:43:20 2009	(r193701)
@@ -969,7 +969,8 @@ hwmp_ioctl_get80211(struct ieee80211vap 
 		}
 		mtx_unlock(&hs->hs_lock);
 		if (len > ireq->i_len || ireq->i_len < sizeof(*fi))
-			return EFAULT;
+			return ENOMEM;
+		ireq->i_len = len;
 		p = malloc(len, M_TEMP, M_NOWAIT | M_ZERO);
 		if (p == NULL)
 			return ENOMEM;