Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Jun 2018 23:52:53 +0000
From:      Brooks Davis <brooks@freebsd.org>
To:        Jung-uk Kim <jkim@FreeBSD.org>
Cc:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r335020 - head/sys/amd64/linux32
Message-ID:  <20180612235253.GA49401@spindle.one-eyed-alien.net>
In-Reply-To: <201806122254.w5CMsmNG087783@repo.freebsd.org>
References:  <201806122254.w5CMsmNG087783@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

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

On Tue, Jun 12, 2018 at 10:54:48PM +0000, Jung-uk Kim wrote:
> Author: jkim
> Date: Tue Jun 12 22:54:48 2018
> New Revision: 335020
> URL: https://svnweb.freebsd.org/changeset/base/335020
>=20
> Log:
>   Fix number of auxargs entries to copy out for 32-bit Linuxulator.
>  =20
>   PR:		228790
>=20
> Modified:
>   head/sys/amd64/linux32/linux32_sysvec.c
>=20
> Modified: head/sys/amd64/linux32/linux32_sysvec.c
> =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/amd64/linux32/linux32_sysvec.c	Tue Jun 12 22:52:27 2018	(r33=
5019)
> +++ head/sys/amd64/linux32/linux32_sysvec.c	Tue Jun 12 22:54:48 2018	(r33=
5020)
> @@ -249,9 +249,10 @@ linux_fixup_elf(register_t **stack_base, struct imag=
e_
> =20
>  	free(imgp->auxargs, M_TEMP);
>  	imgp->auxargs =3D NULL;
> -	KASSERT(pos - argarray <=3D AT_COUNT, ("Too many auxargs"));
> +	KASSERT(pos - argarray <=3D LINUX_AT_COUNT, ("Too many auxargs"));
> =20
> -	error =3D copyout(&argarray[0], auxbase, sizeof(*argarray) * AT_COUNT);
> +	error =3D copyout(&argarray[0], auxbase,
> +	    sizeof(*argarray) * LINUX_AT_COUNT);
>  	free(argarray, M_TEMP);
>  	if (error !=3D 0)
>  		return (error);


Thanks for tracking this down!  Sorry for the breakage.

-- Brooks

--SUOF0GtieIMvvwua
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEcBAEBAgAGBQJbIFzUAAoJEKzQXbSebgfAuWsH/1va6wz4X44jX0/astnWQQEe
1ov8oIz05TG2p6xGtxtsTRDeEELf7/tIQ5wr3VLnmOwOvSnHRlXlTIxxXvDqEJ04
NFCw73jumkLGnvTHD69rMmCHUC1tkHvxh2eSoUYE2EjdjpCDyKBi/LHsZzlMHZ2B
fmqmG7hGtl6VbAWfRwLBwvudrQdPOLsuFO7T9APHIZ84T8j/oCWHtYLtULfYHDUj
fQEvq9ZVM8NSqCP6QOu/9Vhw6kELfTpdWNnw0Lyjeww2EPhgERFycW/lRUwfeG8v
UUu0SKogqGK3vswvhscqkxhJx/2Ruav3sVrvJ7f1ARQUkgBx+vecVeN0XKfslAA=
=kTp3
-----END PGP SIGNATURE-----

--SUOF0GtieIMvvwua--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180612235253.GA49401>