manual page distributed with 4.1BSD

[unix-history] / usr / src / sys / kern / kern_exec.c

diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index 09586bf..14d36e5 100644 (file)
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -1,25 +1,25 @@
-/*     kern_exec.c     4.5     83/07/01        */
+/*     kern_exec.c     6.10    85/03/12        */

 
 #include "../machine/reg.h"
 #include "../machine/pte.h"
 #include "../machine/psl.h"
 
 
 #include "../machine/reg.h"
 #include "../machine/pte.h"
 #include "../machine/psl.h"
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/map.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/kernel.h"
-#include "../h/proc.h"
-#include "../h/buf.h"
-#include "../h/inode.h"
-#include "../h/seg.h"
-#include "../h/vm.h"
-#include "../h/text.h"
-#include "../h/file.h"
-#include "../h/uio.h"
-#include "../h/nami.h"
-#include "../h/acct.h"
+#include "param.h"
+#include "systm.h"
+#include "map.h"
+#include "dir.h"
+#include "user.h"
+#include "kernel.h"
+#include "proc.h"
+#include "buf.h"
+#include "inode.h"
+#include "seg.h"
+#include "vm.h"
+#include "text.h"
+#include "file.h"
+#include "uio.h"
+#include "acct.h"
+#include "exec.h"

 
 #ifdef vax
 #include "../vax/mtpr.h"
 
 #ifdef vax
 #include "../vax/mtpr.h"


@@ -46,16 +46,25 @@ execve()
        register char *cp;
        register struct buf *bp;
        register struct execa *uap;
        register char *cp;
        register struct buf *bp;
        register struct execa *uap;

-       int na, ne, ucp, ap, c;
+       int na, ne, ucp, ap, len, cc;

        int indir, uid, gid;
        char *sharg;
        struct inode *ip;
        swblk_t bno;
        char cfname[MAXCOMLEN + 1];
        int indir, uid, gid;
        char *sharg;
        struct inode *ip;
        swblk_t bno;
        char cfname[MAXCOMLEN + 1];

+#define        SHSIZE  32

        char cfarg[SHSIZE];
        char cfarg[SHSIZE];

-       int resid;
+       union {
+               char    ex_shell[SHSIZE];       /* #! and name of interpreter */
+               struct  exec ex_exec;
+       } exdata;
+       register struct nameidata *ndp = &u.u_nd;
+       int resid, error;

 
 

-       if ((ip = namei(uchar, LOOKUP, 1)) == NULL)
+       ndp->ni_nameiop = LOOKUP | FOLLOW;
+       ndp->ni_segflg = UIO_USERSPACE;
+       ndp->ni_dirp = ((struct execa *)u.u_ap)->fname;
+       if ((ip = namei(ndp)) == NULL)

                return;
        bno = 0;
        bp = 0;
                return;
        bno = 0;
        bp = 0;


@@ -79,7 +88,7 @@ execve()
        }
 
        /*
        }
 
        /*

-        * Read in first few bytes of file for segment sizes, ux_mag:
+        * Read in first few bytes of file for segment sizes, magic number:

         *      407 = plain executable
         *      410 = RO text
         *      413 = demand paged RO text
         *      407 = plain executable
         *      410 = RO text
         *      413 = demand paged RO text


@@ -92,43 +101,42 @@ execve()
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */

-       u.u_exdata.ux_shell[0] = 0;     /* for zero length files */
-       u.u_error = rdwri(UIO_READ, ip, (caddr_t)&u.u_exdata, sizeof (u.u_exdata),
+       exdata.ex_shell[0] = '\0';      /* for zero length files */
+       u.u_error = rdwri(UIO_READ, ip, (caddr_t)&exdata, sizeof (exdata),

            0, 1, &resid);
        if (u.u_error)
                goto bad;
            0, 1, &resid);
        if (u.u_error)
                goto bad;

-       u.u_count = resid;

 #ifndef lint
 #ifndef lint

-       if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A) &&
-           u.u_exdata.ux_shell[0] != '#') {
+       if (resid > sizeof (exdata) - sizeof (exdata.ex_exec.a_magic) &&
+           exdata.ex_shell[0] != '#') {

                u.u_error = ENOEXEC;
                goto bad;
        }
 #endif
                u.u_error = ENOEXEC;
                goto bad;
        }
 #endif

-       switch (u.u_exdata.ux_mag) {
+       switch (exdata.ex_exec.a_magic) {

 
        case 0407:
 
        case 0407:

-               u.u_exdata.ux_dsize += u.u_exdata.ux_tsize;
-               u.u_exdata.ux_tsize = 0;
+               exdata.ex_exec.a_data += exdata.ex_exec.a_text;
+               exdata.ex_exec.a_text = 0;

                break;
 
        case 0413:
        case 0410:
                break;
 
        case 0413:
        case 0410:

-               if (u.u_exdata.ux_tsize == 0) {
+               if (exdata.ex_exec.a_text == 0) {

                        u.u_error = ENOEXEC;
                        goto bad;
                }
                break;
 
        default:
                        u.u_error = ENOEXEC;
                        goto bad;
                }
                break;
 
        default:

-               if (u.u_exdata.ux_shell[0] != '#' ||
-                   u.u_exdata.ux_shell[1] != '!' ||
+               if (exdata.ex_shell[0] != '#' ||
+                   exdata.ex_shell[1] != '!' ||

                    indir) {
                        u.u_error = ENOEXEC;
                        goto bad;
                }
                    indir) {
                        u.u_error = ENOEXEC;
                        goto bad;
                }

-               cp = &u.u_exdata.ux_shell[2];           /* skip "#!" */
-               while (cp < &u.u_exdata.ux_shell[SHSIZE]) {
+               cp = &exdata.ex_shell[2];               /* skip "#!" */
+               while (cp < &exdata.ex_shell[SHSIZE]) {

                        if (*cp == '\t')
                                *cp = ' ';
                        else if (*cp == '\n') {
                        if (*cp == '\t')
                                *cp = ' ';
                        else if (*cp == '\n') {


@@ -141,10 +149,10 @@ execve()
                        u.u_error = ENOEXEC;
                        goto bad;
                }
                        u.u_error = ENOEXEC;
                        goto bad;
                }

-               cp = &u.u_exdata.ux_shell[2];
+               cp = &exdata.ex_shell[2];

                while (*cp == ' ')
                        cp++;
                while (*cp == ' ')
                        cp++;

-               u.u_dirp = cp;
+               ndp->ni_dirp = cp;

                while (*cp && *cp != ' ')
                        cp++;
                sharg = NULL;
                while (*cp && *cp != ' ')
                        cp++;
                sharg = NULL;


@@ -157,14 +165,16 @@ execve()
                                sharg = cfarg;
                        }
                }
                                sharg = cfarg;
                        }
                }

-               if (u.u_dent.d_namlen > MAXCOMLEN)
-                       u.u_dent.d_namlen = MAXCOMLEN;
-               bcopy((caddr_t)u.u_dent.d_name, (caddr_t)cfname,
-                   (unsigned)(u.u_dent.d_namlen + 1));
-               cfname[MAXCOMLEN] = 0;
+               if (ndp->ni_dent.d_namlen > MAXCOMLEN)
+                       ndp->ni_dent.d_namlen = MAXCOMLEN;
+               bcopy((caddr_t)ndp->ni_dent.d_name, (caddr_t)cfname,
+                   (unsigned)(ndp->ni_dent.d_namlen + 1));
+               cfname[MAXCOMLEN] = '\0';

                indir = 1;
                iput(ip);
                indir = 1;
                iput(ip);

-               ip = namei(schar, LOOKUP, 1);
+               ndp->ni_nameiop = LOOKUP | FOLLOW;
+               ndp->ni_segflg = UIO_SYSSPACE;
+               ip = namei(ndp);

                if (ip == NULL)
                        return;
                goto again;
                if (ip == NULL)
                        return;
                goto again;


@@ -176,13 +186,18 @@ execve()
        na = 0;
        ne = 0;
        nc = 0;
        na = 0;
        ne = 0;
        nc = 0;

+       cc = 0;

        uap = (struct execa *)u.u_ap;
        uap = (struct execa *)u.u_ap;

-       if ((bno = rmalloc(argmap, (long)ctod(clrnd((int)btoc(NCARGS))))) == 0) {
-               swkill(u.u_procp, "exece");
+       bno = rmalloc(argmap, (long)ctod(clrnd((int)btoc(NCARGS))));
+       if (bno == 0) {
+               swkill(u.u_procp, "exec: no swap space");

                goto bad;
        }
        if (bno % CLSIZE)
                panic("execa rmalloc");
                goto bad;
        }
        if (bno % CLSIZE)
                panic("execa rmalloc");

+       /*
+        * Copy arguments into file in argdev area.
+        */

        if (uap->argp) for (;;) {
                ap = NULL;
                if (indir && (na == 1 || na == 2 && sharg))
        if (uap->argp) for (;;) {
                ap = NULL;
                if (indir && (na == 1 || na == 2 && sharg))


@@ -191,56 +206,66 @@ execve()
                        ap = fuword((caddr_t)uap->argp);
                        uap->argp++;
                }
                        ap = fuword((caddr_t)uap->argp);
                        uap->argp++;
                }

-               if (ap==NULL && uap->envp) {
+               if (ap == NULL && uap->envp) {

                        uap->argp = NULL;
                        uap->argp = NULL;

-                       if ((ap = fuword((caddr_t)uap->envp)) == NULL)
-                               break;
-                       uap->envp++;
-                       ne++;
+                       if ((ap = fuword((caddr_t)uap->envp)) != NULL)
+                               uap->envp++, ne++;

                }
                if (ap == NULL)
                        break;
                na++;
                }
                if (ap == NULL)
                        break;
                na++;

-               if (ap == -1)
-                       u.u_error = EFAULT;
+               if (ap == -1) {
+                       error = EFAULT;
+                       break;
+               }

                do {
                do {

-                       if (nc >= NCARGS-1)
-                               u.u_error = E2BIG;
-                       if (indir && na == 2 && sharg != NULL)
-                               c = *sharg++ & 0377;
-                       else if ((c = fubyte((caddr_t)ap++)) < 0)
-                               u.u_error = EFAULT;
-                       if (u.u_error) {
-                               if (bp)
-                                       brelse(bp);
-                               bp = 0;
-                               goto badarg;
-                       }
-                       if (nc % (CLSIZE*NBPG) == 0) {
+                       if (cc <= 0) {
+                               /*
+                                * We depend on NCARGS being a multiple of
+                                * CLSIZE*NBPG.  This way we need only check
+                                * overflow before each buffer allocation.
+                                */
+                               if (nc >= NCARGS-1) {
+                                       error = E2BIG;
+                                       break;
+                               }

                                if (bp)
                                        bdwrite(bp);
                                if (bp)
                                        bdwrite(bp);

-                               bp = getblk(argdev, bno + ctod(nc / NBPG),
-                                   CLSIZE*NBPG);
+                               cc = CLSIZE*NBPG;
+                               bp = getblk(argdev, bno + ctod(nc/NBPG), cc);

                                cp = bp->b_un.b_addr;
                        }
                                cp = bp->b_un.b_addr;
                        }

-                       nc++;
-                       *cp++ = c;
-               } while (c > 0);
+                       if (indir && na == 2 && sharg != NULL)
+                               error = copystr(sharg, cp, cc, &len);
+                       else
+                               error = copyinstr((caddr_t)ap, cp, cc, &len);
+                       ap += len;
+                       cp += len;
+                       nc += len;
+                       cc -= len;
+               } while (error == ENOENT);
+               if (error) {
+                       u.u_error = error;
+                       if (bp)
+                               brelse(bp);
+                       bp = 0;
+                       goto badarg;
+               }

        }
        if (bp)
                bdwrite(bp);
        bp = 0;
        nc = (nc + NBPW-1) & ~(NBPW-1);
        if (indir) {
        }
        if (bp)
                bdwrite(bp);
        bp = 0;
        nc = (nc + NBPW-1) & ~(NBPW-1);
        if (indir) {

-               u.u_dent.d_namlen = strlen(cfname);
-               bcopy((caddr_t)cfname, (caddr_t)u.u_dent.d_name,
-                   (unsigned)(u.u_dent.d_namlen + 1));
+               ndp->ni_dent.d_namlen = strlen(cfname);
+               bcopy((caddr_t)cfname, (caddr_t)ndp->ni_dent.d_name,
+                   (unsigned)(ndp->ni_dent.d_namlen + 1));

        }
        }

-       getxfile(ip, nc + (na+4)*NBPW, uid, gid);
+       getxfile(ip, &exdata.ex_exec, nc + (na+4)*NBPW, uid, gid);

        if (u.u_error) {
 badarg:
        if (u.u_error) {
 badarg:

-               for (c = 0; c < nc; c += CLSIZE*NBPG) {
-                       bp = baddr(argdev, bno + ctod(c / NBPG), CLSIZE*NBPG);
+               for (cc = 0; cc < nc; cc += CLSIZE*NBPG) {
+                       bp = baddr(argdev, bno + ctod(cc/NBPG), CLSIZE*NBPG);

                        if (bp) {
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                        if (bp) {
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */


@@ -252,16 +277,17 @@ badarg:
        }
 
        /*
        }
 
        /*

-        * copy back arglist
+        * Copy back arglist.

         */
        ucp = USRSTACK - nc - NBPW;
        ap = ucp - na*NBPW - 3*NBPW;
        u.u_ar0[SP] = ap;
        (void) suword((caddr_t)ap, na-ne);
        nc = 0;
         */
        ucp = USRSTACK - nc - NBPW;
        ap = ucp - na*NBPW - 3*NBPW;
        u.u_ar0[SP] = ap;
        (void) suword((caddr_t)ap, na-ne);
        nc = 0;

+       cc = 0;

        for (;;) {
                ap += NBPW;
        for (;;) {
                ap += NBPW;

-               if (na==ne) {
+               if (na == ne) {

                        (void) suword((caddr_t)ap, 0);
                        ap += NBPW;
                }
                        (void) suword((caddr_t)ap, 0);
                        ap += NBPW;
                }


@@ -269,21 +295,32 @@ badarg:
                        break;
                (void) suword((caddr_t)ap, ucp);
                do {
                        break;
                (void) suword((caddr_t)ap, ucp);
                do {

-                       if (nc % (CLSIZE*NBPG) == 0) {
+                       if (cc <= 0) {

                                if (bp)
                                        brelse(bp);
                                if (bp)
                                        brelse(bp);

-                               bp = bread(argdev, bno + ctod(nc / NBPG),
-                                   CLSIZE*NBPG);
+                               cc = CLSIZE*NBPG;
+                               bp = bread(argdev, bno + ctod(nc / NBPG), cc);

                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;
                        }
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;
                        }

-                       (void) subyte((caddr_t)ucp++, (c = *cp++));
-                       nc++;
-               } while(c&0377);
+                       error = copyoutstr(cp, (caddr_t)ucp, cc, &len);
+                       ucp += len;
+                       cp += len;
+                       nc += len;
+                       cc -= len;
+               } while (error == ENOENT);
+               if (error == EFAULT)
+                       panic("exec: EFAULT");

        }
        (void) suword((caddr_t)ap, 0);
        }
        (void) suword((caddr_t)ap, 0);

-       setregs();
+       setregs(exdata.ex_exec.a_entry);
+       /*
+        * Remember file name for accounting.
+        */
+       u.u_acflag &= ~AFORK;
+       bcopy((caddr_t)ndp->ni_dent.d_name, (caddr_t)u.u_comm,
+           (unsigned)(ndp->ni_dent.d_namlen + 1));

 bad:
        if (bp)
                brelse(bp);
 bad:
        if (bp)
                brelse(bp);


@@ -295,19 +332,24 @@ bad:
 /*
  * Read in and set up memory for executed file.
  */
 /*
  * Read in and set up memory for executed file.
  */

-getxfile(ip, nargc, uid, gid)
+getxfile(ip, ep, nargc, uid, gid)

        register struct inode *ip;
        register struct inode *ip;

+       register struct exec *ep;

        int nargc, uid, gid;
 {
        register size_t ts, ds, ss;
        int pagi;
 
        int nargc, uid, gid;
 {
        register size_t ts, ds, ss;
        int pagi;
 

-       if (u.u_exdata.ux_mag == 0413)
+       if (ep->a_magic == 0413)

                pagi = SPAGI;
        else
                pagi = 0;
                pagi = SPAGI;
        else
                pagi = 0;

-       if (u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 &&
-           ip->i_count!=1) {
+       if (ip->i_flag & IXMOD) {                       /* XXX */
+               u.u_error = ETXTBSY;
+               goto bad;
+       }
+       if (ep->a_text != 0 && (ip->i_flag&ITEXT) == 0 &&
+           ip->i_count != 1) {

                register struct file *fp;
 
                for (fp = file; fp < fileNFILE; fp++) {
                register struct file *fp;
 
                for (fp = file; fp < fileNFILE; fp++) {


@@ -324,8 +366,8 @@ getxfile(ip, nargc, uid, gid)
        /*
         * Compute text and data sizes and make sure not too large.
         */
        /*
         * Compute text and data sizes and make sure not too large.
         */

-       ts = clrnd(btoc(u.u_exdata.ux_tsize));
-       ds = clrnd(btoc((u.u_exdata.ux_dsize+u.u_exdata.ux_bsize)));
+       ts = clrnd(btoc(ep->a_text));
+       ds = clrnd(btoc(ep->a_data + ep->a_bss));

        ss = clrnd(SSIZE + btoc(nargc));
        if (chksize((unsigned)ts, (unsigned)ds, (unsigned)ss))
                goto bad;
        ss = clrnd(SSIZE + btoc(nargc));
        if (chksize((unsigned)ts, (unsigned)ds, (unsigned)ss))
                goto bad;


@@ -366,14 +408,14 @@ getxfile(ip, nargc, uid, gid)
                u.u_error =
                    rdwri(UIO_READ, ip,
                        (char *)ctob(dptov(u.u_procp, 0)),
                u.u_error =
                    rdwri(UIO_READ, ip,
                        (char *)ctob(dptov(u.u_procp, 0)),

-                       (int)u.u_exdata.ux_dsize,
-                       (int)(sizeof(u.u_exdata)+u.u_exdata.ux_tsize),
+                       (int)ep->a_data,
+                       (int)(sizeof (struct exec) + ep->a_text),

                        0, (int *)0);
                        0, (int *)0);

-       xalloc(ip, pagi);
+       xalloc(ip, ep, pagi);

        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),
                    PG_FTEXT, u.u_procp->p_textp->x_iptr,
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),
                    PG_FTEXT, u.u_procp->p_textp->x_iptr,

-                   (long)(1 + ts/CLSIZE), (int)btoc(u.u_exdata.ux_dsize));
+                   (long)(1 + ts/CLSIZE), (int)btoc(ep->a_data));

 
 #ifdef vax
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
 
 #ifdef vax
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */


@@ -381,7 +423,7 @@ getxfile(ip, nargc, uid, gid)
 #endif
 
        if (u.u_error)
 #endif
 
        if (u.u_error)

-               swkill(u.u_procp, "i/o error mapping pages");
+               swkill(u.u_procp, "exec: I/O error mapping pages");

        /*
         * set SUID/SGID protections, if no tracing
         */
        /*
         * set SUID/SGID protections, if no tracing
         */


@@ -394,6 +436,7 @@ getxfile(ip, nargc, uid, gid)
        u.u_tsize = ts;
        u.u_dsize = ds;
        u.u_ssize = ss;
        u.u_tsize = ts;
        u.u_dsize = ds;
        u.u_ssize = ss;

+       u.u_prof.pr_scale = 0;

 bad:
        return;
 }
 bad:
        return;
 }


@@ -401,7 +444,8 @@ bad:
 /*
  * Clear registers on exec
  */
 /*
  * Clear registers on exec
  */

-setregs()
+setregs(entry)
+       u_long entry;

 {
        register int i;
        register struct proc *p = u.u_procp;
 {
        register int i;
        register struct proc *p = u.u_procp;


@@ -417,12 +461,19 @@ setregs()
                u.u_signal[i] = SIG_DFL;
                (void) spl0();
        }
                u.u_signal[i] = SIG_DFL;
                (void) spl0();
        }

+       /*
+        * Reset stack state to the user stack.
+        * Clear set of signals caught on the signal stack.
+        */
+       u.u_onstack = 0;
+       u.u_sigsp = 0;
+       u.u_sigonstack = 0;

 #ifdef notdef
        /* should pass args to init on the stack */
        for (rp = &u.u_ar0[0]; rp < &u.u_ar0[16];)
                *rp++ = 0;
 #endif
 #ifdef notdef
        /* should pass args to init on the stack */
        for (rp = &u.u_ar0[0]; rp < &u.u_ar0[16];)
                *rp++ = 0;
 #endif

-       u.u_ar0[PC] = u.u_exdata.ux_entloc+2;
+       u.u_ar0[PC] = entry + 2;

        for (i=0; i<NOFILE; i++) {
                if (u.u_pofile[i]&UF_EXCLOSE) {
                        closef(u.u_ofile[i]);
        for (i=0; i<NOFILE; i++) {
                if (u.u_pofile[i]&UF_EXCLOSE) {
                        closef(u.u_ofile[i]);


@@ -431,11 +482,4 @@ setregs()
                }
                u.u_pofile[i] &= ~UF_MAPPED;
        }
                }
                u.u_pofile[i] &= ~UF_MAPPED;
        }

-
-       /*
-        * Remember file name for accounting.
-        */
-       u.u_acflag &= ~AFORK;
-       bcopy((caddr_t)u.u_dent.d_name, (caddr_t)u.u_comm,
-           (unsigned)(u.u_dent.d_namlen + 1));

 }
 }