From owner-svn-src-all@FreeBSD.ORG  Thu Nov 12 13:52:12 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C76EB1065696;
	Thu, 12 Nov 2009 13:52:12 +0000 (UTC) (envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211])
	by mx1.freebsd.org (Postfix) with ESMTP id 8ACB28FC17;
	Thu, 12 Nov 2009 13:52:12 +0000 (UTC)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id B5CF71CDE9; Thu, 12 Nov 2009 14:52:11 +0100 (CET)
Date: Thu, 12 Nov 2009 14:52:11 +0100
From: Ed Schouten <ed@80386.nl>
To: Xin LI <delphij@FreeBSD.org>
Message-ID: <20091112135211.GT64905@hoeg.nl>
References: <200911112130.nABLUw9b007768@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="HC0F8i/BfMshQzR8"
Content-Disposition: inline
In-Reply-To: <200911112130.nABLUw9b007768@svn.freebsd.org>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r199201 - in head: contrib/libpcap sbin/ifconfig
 share/man/man4 sys/kern sys/net sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2009 13:52:12 -0000


--HC0F8i/BfMshQzR8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

* Xin LI <delphij@FreeBSD.org> wrote:
> Modified: head/sys/net/if_var.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/net/if_var.h	Wed Nov 11 21:18:27 2009	(r199200)
> +++ head/sys/net/if_var.h	Wed Nov 11 21:30:58 2009	(r199201)
> @@ -198,6 +198,7 @@ struct ifnet {
>  	void	*if_pf_kif;
>  	void	*if_lagg;		/* lagg glue */
>  	u_char	 if_alloctype;		/* if_type at time of allocation */
> +	struct sbuf *if_description;	/* interface description */
> =20
>  	/*
>  	 * Spare fields are added so that we can modify sensitive data
> @@ -205,7 +206,7 @@ struct ifnet {
>  	 * be used with care where binary compatibility is required.
>  	 */
>  	char	 if_cspare[3];
> -	void	*if_pspare[8];
> +	void	*if_pspare[7];
>  	int	if_ispare[4];
>  };

So there used to be four chars in a row here (between if_description and
if_cspare). Are you sure moving the pointer in between doesn't increase
the structure size?

--=20
 Ed Schouten <ed@80386.nl>
 WWW: http://80386.nl/

--HC0F8i/BfMshQzR8
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)

iEYEARECAAYFAkr8EwsACgkQ52SDGA2eCwVoiACcDYc3d3KzLm0ycZBqFqXMuvW7
qzoAmgOI8tUIIo9Te5M9bltXF/5kj2WQ
=k0KH
-----END PGP SIGNATURE-----

--HC0F8i/BfMshQzR8--