From owner-svn-src-stable-7@FreeBSD.ORG  Wed May 20 02:48:54 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9119106566C;
	Wed, 20 May 2009 02:48:53 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B5A048FC1A;
	Wed, 20 May 2009 02:48:53 +0000 (UTC) (envelope-from mav@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 n4K2mr48016737;
	Wed, 20 May 2009 02:48:53 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4K2mrKF016736;
	Wed, 20 May 2009 02:48:53 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200905200248.n4K2mrKF016736@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 20 May 2009 02:48:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192415 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netgraph/netflow
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2009 02:48:54 -0000

Author: mav
Date: Wed May 20 02:48:53 2009
New Revision: 192415
URL: http://svn.freebsd.org/changeset/base/192415

Log:
  MFC rev. 192032
  
  Fix copy-paste bug in NGM_NETFLOW_SETCONFIG argument size verification.
  
  PR:		kern/134220
  Submitted by:	Eugene Mychlo

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netgraph/netflow/ng_netflow.c

Modified: stable/7/sys/netgraph/netflow/ng_netflow.c
==============================================================================
--- stable/7/sys/netgraph/netflow/ng_netflow.c	Wed May 20 02:24:09 2009	(r192414)
+++ stable/7/sys/netgraph/netflow/ng_netflow.c	Wed May 20 02:48:53 2009	(r192415)
@@ -422,7 +422,7 @@ ng_netflow_rcvmsg (node_p node, item_p i
 		{
 			struct ng_netflow_setconfig *set;
 
-			if (msg->header.arglen != sizeof(struct ng_netflow_settimeouts))
+			if (msg->header.arglen != sizeof(struct ng_netflow_setconfig))
 				ERROUT(EINVAL);
 
 			set = (struct ng_netflow_setconfig *)msg->data;