Re: svn commit: r335020 - head/sys/amd64/linux32

2018-06-12 Thread Brooks Davis
On Tue, Jun 12, 2018 at 10:54:48PM +, 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
> 
> Log:
>   Fix number of auxargs entries to copy out for 32-bit Linuxulator.
>   
>   PR: 228790
> 
> Modified:
>   head/sys/amd64/linux32/linux32_sysvec.c
> 
> Modified: head/sys/amd64/linux32/linux32_sysvec.c
> ==
> --- head/sys/amd64/linux32/linux32_sysvec.c   Tue Jun 12 22:52:27 2018
> (r335019)
> +++ head/sys/amd64/linux32/linux32_sysvec.c   Tue Jun 12 22:54:48 2018
> (r335020)
> @@ -249,9 +249,10 @@ linux_fixup_elf(register_t **stack_base, struct image_
>  
>   free(imgp->auxargs, M_TEMP);
>   imgp->auxargs = NULL;
> - KASSERT(pos - argarray <= AT_COUNT, ("Too many auxargs"));
> + KASSERT(pos - argarray <= LINUX_AT_COUNT, ("Too many auxargs"));
>  
> - error = copyout([0], auxbase, sizeof(*argarray) * AT_COUNT);
> + error = copyout([0], auxbase,
> + sizeof(*argarray) * LINUX_AT_COUNT);
>   free(argarray, M_TEMP);
>   if (error != 0)
>   return (error);


Thanks for tracking this down!  Sorry for the breakage.

-- Brooks


signature.asc
Description: PGP signature


svn commit: r335020 - head/sys/amd64/linux32

2018-06-12 Thread Jung-uk Kim
Author: jkim
Date: Tue Jun 12 22:54:48 2018
New Revision: 335020
URL: https://svnweb.freebsd.org/changeset/base/335020

Log:
  Fix number of auxargs entries to copy out for 32-bit Linuxulator.
  
  PR:   228790

Modified:
  head/sys/amd64/linux32/linux32_sysvec.c

Modified: head/sys/amd64/linux32/linux32_sysvec.c
==
--- head/sys/amd64/linux32/linux32_sysvec.c Tue Jun 12 22:52:27 2018
(r335019)
+++ head/sys/amd64/linux32/linux32_sysvec.c Tue Jun 12 22:54:48 2018
(r335020)
@@ -249,9 +249,10 @@ linux_fixup_elf(register_t **stack_base, struct image_
 
free(imgp->auxargs, M_TEMP);
imgp->auxargs = NULL;
-   KASSERT(pos - argarray <= AT_COUNT, ("Too many auxargs"));
+   KASSERT(pos - argarray <= LINUX_AT_COUNT, ("Too many auxargs"));
 
-   error = copyout([0], auxbase, sizeof(*argarray) * AT_COUNT);
+   error = copyout([0], auxbase,
+   sizeof(*argarray) * LINUX_AT_COUNT);
free(argarray, M_TEMP);
if (error != 0)
return (error);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"