From owner-svn-src-head@FreeBSD.ORG  Tue Jun 28 08:41:44 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 913F91065670;
	Tue, 28 Jun 2011 08:41:44 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 818198FC0C;
	Tue, 28 Jun 2011 08:41:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5S8fiYG035987;
	Tue, 28 Jun 2011 08:41:44 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5S8fi00035985;
	Tue, 28 Jun 2011 08:41:44 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201106280841.p5S8fi00035985@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 28 Jun 2011 08:41:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223625 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 28 Jun 2011 08:41:44 -0000

Author: pluknet
Date: Tue Jun 28 08:41:44 2011
New Revision: 223625
URL: http://svn.freebsd.org/changeset/base/223625

Log:
  Update ifc_len field of struct ifconf passed for the ioctl SIOCGIFCONF32
  (i.e. under COMPAT_FREEBSD32) in case ifconf() returned success to match
  the native SIOCGIFCONF behavior.
  
  PR:		kern/158369
  Reported by:	Paul Procacci <pprocacci att gmail com>
  MFC after:	1 week

Modified:
  head/sys/net/if.c

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Tue Jun 28 08:36:48 2011	(r223624)
+++ head/sys/net/if.c	Tue Jun 28 08:41:44 2011	(r223625)
@@ -2467,6 +2467,8 @@ ifioctl(struct socket *so, u_long cmd, c
 
 			error = ifconf(SIOCGIFCONF, (void *)&ifc);
 			CURVNET_RESTORE();
+			if (error == 0)
+				ifc32->ifc_len = ifc.ifc_len;
 			return (error);
 		}
 #endif