setgroups check int > NGROUPS, so negative would fail; minor cleanup

SCCS-vsn: sys/kern/kern_prot.c 7.14

diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index 4ff5fbc..e65eb64 100644 (file)
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_prot.c 7.13 (Berkeley) %G%
+ *     @(#)kern_prot.c 7.14 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -377,22 +377,21 @@ setgroups(p, uap, retval)
        int *retval;
 {
        register gid_t *gp;
        int *retval;
 {
        register gid_t *gp;

+       register u_int ngrps;

        register int *lp;
        register int *lp;

-       int error, ngrp, groups[NGROUPS];
+       int error, groups[NGROUPS];

 
        if (error = suser(u.u_cred, &u.u_acflag))
                return (error);
 
        if (error = suser(u.u_cred, &u.u_acflag))
                return (error);

-       ngrp = uap->gidsetsize;
-       if (ngrp > NGROUPS)
+       if ((ngrps = uap->gidsetsize) > NGROUPS)

                return (EINVAL);
                return (EINVAL);

-       error = copyin((caddr_t)uap->gidset, (caddr_t)groups,
-           uap->gidsetsize * sizeof (groups[0]));
-       if (error)
+       if (error = copyin((caddr_t)uap->gidset, (caddr_t)groups,
+           ngrps * sizeof (groups[0])))

                return (error);
                return (error);

-       gp = u.u_cred->cr_groups;
-       for (lp = groups; lp < &groups[uap->gidsetsize]; )
-               *gp++ = *lp++;
-       u.u_cred->cr_ngroups = ngrp;
+       u.u_cred->cr_ngroups = ngrps;
+       /* convert from int's to gid_t's */
+       for (gp = u.u_cred->cr_groups, lp = groups; ngrps--; *gp++ = *lp++)
+               /* void */;

        return (0);
 }
 
        return (0);
 }