from shannon

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

diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index 715ede3..1df99f2 100644 (file)
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -1,18 +1,17 @@
-/*     kern_prot.c     5.5     82/08/24        */
+/*     kern_prot.c     5.15    83/02/20        */

 
 /*
  * System calls related to processes and protection
  */
 
 
 /*
  * System calls related to processes and protection
  */
 

+#include "../machine/reg.h"
+

 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/param.h"
 #include "../h/systm.h"
 #include "../h/dir.h"
 #include "../h/user.h"

-#include "../h/reg.h"

 #include "../h/inode.h"
 #include "../h/proc.h"
 #include "../h/inode.h"
 #include "../h/proc.h"

-#include "../h/clock.h"
-#include "../h/mtpr.h"

 #include "../h/timeb.h"
 #include "../h/times.h"
 #include "../h/reboot.h"
 #include "../h/timeb.h"
 #include "../h/times.h"
 #include "../h/reboot.h"


@@ -63,7 +62,7 @@ getgid()
 getgroups()
 {
        register struct a {
 getgroups()
 {
        register struct a {

-               int     gidsetsize;
+               u_int   gidsetsize;

                int     *gidset;
        } *uap = (struct a *)u.u_ap;
        register int *gp;
                int     *gidset;
        } *uap = (struct a *)u.u_ap;
        register int *gp;


@@ -76,11 +75,10 @@ getgroups()
                return;
        }
        uap->gidsetsize = gp - u.u_groups;
                return;
        }
        uap->gidsetsize = gp - u.u_groups;

-       if (copyout((caddr_t)u.u_groups, (caddr_t)uap->gidset,
-           uap->gidsetsize * sizeof (u.u_groups[0]))) {
-               u.u_error = EFAULT;
+       u.u_error = copyout((caddr_t)u.u_groups, (caddr_t)uap->gidset,
+           uap->gidsetsize * sizeof (u.u_groups[0]));
+       if (u.u_error)

                return;
                return;

-       }

        u.u_r.r_val1 = uap->gidsetsize;
 }
 
        u.u_r.r_val1 = uap->gidsetsize;
 }
 


@@ -107,7 +105,41 @@ setpgrp()
        p->p_pgrp = uap->pgrp;
 }
 
        p->p_pgrp = uap->pgrp;
 }
 

-setuid()
+setreuid()
+{
+       struct a {
+               int     ruid;
+               int     euid;
+       } *uap;
+       register int ruid, euid;
+
+       uap = (struct a *)u.u_ap;
+       ruid = uap->ruid;
+       if (ruid == -1)
+               ruid = u.u_ruid;
+       if (u.u_ruid != ruid && u.u_uid != ruid && !suser())
+               return;
+       euid = uap->euid;
+       if (euid == -1)
+               euid = u.u_uid;
+       if (u.u_ruid != euid && u.u_uid != euid && !suser())
+               return;
+       /*
+        * Everything's okay, do it.
+        */
+#ifdef QUOTA
+       if (u.u_quota->q_uid != ruid) {
+               qclean();
+               qstart(getquota(ruid, 0, 0));
+       }
+#endif
+       u.u_procp->p_uid = ruid;
+       u.u_ruid = ruid;
+       u.u_uid = euid;
+}
+
+#ifndef NOCOMPAT
+osetuid()

 {
        register uid;
        register struct a {
 {
        register uid;
        register struct a {


@@ -128,8 +160,37 @@ setuid()
                u.u_ruid = uid;
        }
 }
                u.u_ruid = uid;
        }
 }

+#endif
+
+setregid()
+{
+       register struct a {
+               int     rgid;
+               int     egid;
+       } *uap;
+       register int rgid, egid;
+
+       uap = (struct a *)u.u_ap;
+       rgid = uap->rgid;
+       if (rgid == -1)
+               rgid = u.u_rgid;
+       if (u.u_rgid != rgid && u.u_gid != rgid && !suser())
+               return;
+       egid = uap->egid;
+       if (egid == -1)
+               egid = u.u_gid;
+       if (u.u_rgid != egid && u.u_gid != egid && !suser())
+               return;
+       if (u.u_rgid != rgid) {
+               leavegroup(u.u_rgid);
+               (void) entergroup(rgid);
+               u.u_rgid = rgid;
+       }
+       u.u_gid = egid;
+}

 
 

-setgid()
+#ifndef NOCOMPAT
+osetgid()

 {
        register gid;
        register struct a {
 {
        register gid;
        register struct a {


@@ -139,7 +200,7 @@ setgid()
        uap = (struct a *)u.u_ap;
        gid = uap->gid;
        if (u.u_rgid == gid || u.u_gid == gid || suser()) {
        uap = (struct a *)u.u_ap;
        gid = uap->gid;
        if (u.u_rgid == gid || u.u_gid == gid || suser()) {

-               leavegroup(u.u_gid); leavegroup(u.u_rgid);
+               leavegroup(u.u_rgid);

                (void) entergroup(gid);
                u.u_gid = gid;
                u.u_rgid = gid;
                (void) entergroup(gid);
                u.u_gid = gid;
                u.u_rgid = gid;


@@ -149,22 +210,21 @@ setgid()
 setgroups()
 {
        register struct a {
 setgroups()
 {
        register struct a {

-               int     gidsetsize;
+               u_int   gidsetsize;

                int     *gidset;
        } *uap = (struct a *)u.u_ap;
        register int *gp;
 
                int     *gidset;
        } *uap = (struct a *)u.u_ap;
        register int *gp;
 

-       if (suser())
+       if (!suser())

                return;
        if (uap->gidsetsize > sizeof (u.u_groups) / sizeof (u.u_groups[0])) {
                u.u_error = EINVAL;
                return;
        }
                return;
        if (uap->gidsetsize > sizeof (u.u_groups) / sizeof (u.u_groups[0])) {
                u.u_error = EINVAL;
                return;
        }

-       if (copyin((caddr_t)uap->gidset, (caddr_t)u.u_groups,
-           uap->gidsetsize * sizeof (u.u_groups[0]))) {
-               u.u_error = EFAULT;
+       u.u_error = copyin((caddr_t)uap->gidset, (caddr_t)u.u_groups,
+           uap->gidsetsize * sizeof (u.u_groups[0]));
+       if (u.u_error)

                return;
                return;

-       }

        for (gp = &u.u_groups[uap->gidsetsize]; gp < &u.u_groups[NGROUPS]; gp++)
                *gp = -1;
 }
        for (gp = &u.u_groups[uap->gidsetsize]; gp < &u.u_groups[NGROUPS]; gp++)
                *gp = -1;
 }