[src/netbsd-7]: src/sys/kern Pull up following revision(s) (requested by dhol...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/96daedf08ba3
branches:  netbsd-7
changeset: 798461:96daedf08ba3
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Oct 25 10:00:47 2014 +0000

description:
Pull up following revision(s) (requested by dholland in ticket #156):
        sys/kern/kern_exec.c: revision 1.409
PR/49287: David Holland: Skip the right number of bytes to go over the first
argument in the argv vector. Fixes netbsd32 script execution, where you lost
the first argument because it skipped 8 bytes instead of 4.

diffstat:

 sys/kern/kern_exec.c |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r d8314f665b84 -r 96daedf08ba3 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Fri Oct 24 23:13:22 2014 +0000
+++ b/sys/kern/kern_exec.c      Sat Oct 25 10:00:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.408 2014/06/22 17:23:34 maxv Exp $     */
+/*     $NetBSD: kern_exec.c,v 1.408.2.1 2014/10/25 10:00:47 martin Exp $       */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408 2014/06/22 17:23:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408.2.1 2014/10/25 10:00:47 martin Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1336,6 +1336,12 @@
 }
 
 static size_t
+ptrsz(const struct exec_package *epp)
+{
+       return (epp->ep_flags & EXEC_32) ?  sizeof(int) : sizeof(char *);
+}
+
+static size_t
 calcargs(struct execve_data * restrict data, const size_t argenvstrlen)
 {
        struct exec_package     * const epp = &data->ed_pack;
@@ -1348,10 +1354,7 @@
            1 +                         /* \0 */
            epp->ep_esch->es_arglen;    /* auxinfo */
 
-       const size_t ptrsz = (epp->ep_flags & EXEC_32) ?
-           sizeof(int) : sizeof(char *);
-
-       return (nargenvptrs * ptrsz) + argenvstrlen;
+       return (nargenvptrs * ptrsz(epp)) + argenvstrlen;
 }
 
 static size_t
@@ -1506,7 +1509,7 @@
                return EINVAL;
        }
        if (epp->ep_flags & EXEC_SKIPARG)
-               args++;
+               args = (const void *)((const char *)args + ptrsz(epp));
        i = 0;
        error = copyinargstrs(data, args, fetch_element, &dp, &i, ktr_execarg);
        if (error != 0) {