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

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

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index 55fdbb7..48a9146 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -1,18 +1,8 @@
 /*
  *
 /*
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)uipc_usrreq.c       7.11 (Berkeley) %G%
+ *     @(#)uipc_usrreq.c       7.20 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -24,10 +14,9 @@
 #include "unpcb.h"
 #include "un.h"
 #include "vnode.h"
 #include "unpcb.h"
 #include "un.h"
 #include "vnode.h"

-#include "mount.h"

 #include "file.h"
 #include "stat.h"
 #include "file.h"
 #include "stat.h"

-#include "mbuf.h"      /* XXX must appear after mount.h */
+#include "mbuf.h"

 
 /*
  * Unix communications domain.
 
 /*
  * Unix communications domain.


@@ -38,21 +27,21 @@
  *     need a proper out-of-band
  */
 struct sockaddr sun_noname = { sizeof(sun_noname), AF_UNIX };
  *     need a proper out-of-band
  */
 struct sockaddr sun_noname = { sizeof(sun_noname), AF_UNIX };

-ino_t  unp_vno;                        /* prototype for fake vnode numbers */
+ino_t  unp_ino;                        /* prototype for fake inode numbers */

 
 /*ARGSUSED*/
 
 /*ARGSUSED*/

-uipc_usrreq(so, req, m, nam, rights)
+uipc_usrreq(so, req, m, nam, control)

        struct socket *so;
        int req;
        struct socket *so;
        int req;

-       struct mbuf *m, *nam, *rights;
+       struct mbuf *m, *nam, *control;

 {
        struct unpcb *unp = sotounpcb(so);
        register struct socket *so2;
 {
        struct unpcb *unp = sotounpcb(so);
        register struct socket *so2;

-       int error = 0;
+       register int error = 0;

 
        if (req == PRU_CONTROL)
                return (EOPNOTSUPP);
 
        if (req == PRU_CONTROL)
                return (EOPNOTSUPP);

-       if (req != PRU_SEND && rights && rights->m_len) {
+       if (req != PRU_SEND && control && control->m_len) {

                error = EOPNOTSUPP;
                goto release;
        }
                error = EOPNOTSUPP;
                goto release;
        }


@@ -148,11 +137,8 @@ uipc_usrreq(so, req, m, nam, rights)
                break;
 
        case PRU_SEND:
                break;
 
        case PRU_SEND:

-               if (rights) {
-                       error = unp_internalize(rights);
-                       if (error)
-                               break;
-               }
+               if (control && (error = unp_internalize(control)))
+                       break;

                switch (so->so_type) {
 
                case SOCK_DGRAM: {
                switch (so->so_type) {
 
                case SOCK_DGRAM: {


@@ -177,10 +163,10 @@ uipc_usrreq(so, req, m, nam, rights)
                                from = mtod(unp->unp_addr, struct sockaddr *);
                        else
                                from = &sun_noname;
                                from = mtod(unp->unp_addr, struct sockaddr *);
                        else
                                from = &sun_noname;

-                       if (sbspace(&so2->so_rcv) > 0 &&
-                           sbappendaddr(&so2->so_rcv, from, m, rights)) {
+                       if (sbappendaddr(&so2->so_rcv, from, m, control)) {

                                sorwakeup(so2);
                                m = 0;
                                sorwakeup(so2);
                                m = 0;

+                               control = 0;

                        } else
                                error = ENOBUFS;
                        if (nam)
                        } else
                                error = ENOBUFS;
                        if (nam)


@@ -203,9 +189,10 @@ uipc_usrreq(so, req, m, nam, rights)
                         * send buffer hiwater marks to maintain backpressure.
                         * Wake up readers.
                         */
                         * send buffer hiwater marks to maintain backpressure.
                         * Wake up readers.
                         */

-                       if (rights)
-                               (void)sbappendrights(rcv, m, rights);
-                       else
+                       if (control) {
+                               (void)sbappendcontrol(rcv, m, control);
+                               control = 0;
+                       } else

                                sbappend(rcv, m);
                        snd->sb_mbmax -=
                            rcv->sb_mbcnt - unp->unp_conn->unp_mbcnt;
                                sbappend(rcv, m);
                        snd->sb_mbmax -=
                            rcv->sb_mbcnt - unp->unp_conn->unp_mbcnt;


@@ -234,9 +221,9 @@ uipc_usrreq(so, req, m, nam, rights)
                        ((struct stat *) m)->st_blksize += so2->so_rcv.sb_cc;
                }
                ((struct stat *) m)->st_dev = NODEV;
                        ((struct stat *) m)->st_blksize += so2->so_rcv.sb_cc;
                }
                ((struct stat *) m)->st_dev = NODEV;

-               if (unp->unp_vno == 0)
-                       unp->unp_vno = unp_vno++;
-               ((struct stat *) m)->st_ino = unp->unp_vno;
+               if (unp->unp_ino == 0)
+                       unp->unp_ino = unp_ino++;
+               ((struct stat *) m)->st_ino = unp->unp_ino;

                return (0);
 
        case PRU_RCVOOB:
                return (0);
 
        case PRU_RCVOOB:


@@ -271,6 +258,8 @@ uipc_usrreq(so, req, m, nam, rights)
                panic("piusrreq");
        }
 release:
                panic("piusrreq");
        }
 release:

+       if (control)
+               m_freem(control);

        if (m)
                m_freem(m);
        return (error);
        if (m)
                m_freem(m);
        return (error);


@@ -369,9 +358,14 @@ unp_bind(unp, nam)
        vp = ndp->ni_vp;
        if (vp != NULL) {
                VOP_ABORTOP(ndp);
        vp = ndp->ni_vp;
        if (vp != NULL) {
                VOP_ABORTOP(ndp);

+               if (ndp->ni_dvp == vp)
+                       vrele(ndp->ni_dvp);
+               else
+                       vput(ndp->ni_dvp);
+               vrele(vp);

                return (EADDRINUSE);
        }
                return (EADDRINUSE);
        }

-       vattr_null(&vattr);
+       VATTR_NULL(&vattr);

        vattr.va_type = VSOCK;
        vattr.va_mode = 0777;
        if (error = VOP_CREATE(ndp, &vattr))
        vattr.va_type = VSOCK;
        vattr.va_mode = 0777;
        if (error = VOP_CREATE(ndp, &vattr))


@@ -406,12 +400,12 @@ unp_connect(so, nam)
        if (error = namei(ndp))
                return (error);
        vp = ndp->ni_vp;
        if (error = namei(ndp))
                return (error);
        vp = ndp->ni_vp;

-       if (error = vn_access(vp, VWRITE, ndp->ni_cred))
-               goto bad;

        if (vp->v_type != VSOCK) {
                error = ENOTSOCK;
                goto bad;
        }
        if (vp->v_type != VSOCK) {
                error = ENOTSOCK;
                goto bad;
        }

+       if (error = VOP_ACCESS(vp, VWRITE, ndp->ni_cred))
+               goto bad;

        so2 = vp->v_socket;
        if (so2 == 0) {
                error = ECONNREFUSED;
        so2 = vp->v_socket;
        if (so2 == 0) {
                error = ECONNREFUSED;


@@ -423,7 +417,7 @@ unp_connect(so, nam)
        }
        if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
                if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
        }
        if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
                if ((so2->so_options & SO_ACCEPTCONN) == 0 ||

-                   (so3 = sonewconn(so2)) == 0) {
+                   (so3 = sonewconn(so2, 0)) == 0) {

                        error = ECONNREFUSED;
                        goto bad;
                }
                        error = ECONNREFUSED;
                        goto bad;
                }


@@ -461,8 +455,8 @@ unp_connect2(so, so2)
 
        case SOCK_STREAM:
                unp2->unp_conn = unp;
 
        case SOCK_STREAM:
                unp2->unp_conn = unp;

-               soisconnected(so2);

                soisconnected(so);
                soisconnected(so);

+               soisconnected(so2);

                break;
 
        default:
                break;
 
        default:


@@ -549,10 +543,11 @@ unp_drain()
 unp_externalize(rights)
        struct mbuf *rights;
 {
 unp_externalize(rights)
        struct mbuf *rights;
 {

-       int newfds = rights->m_len / sizeof (int);

        register int i;
        register int i;

-       register struct file **rp = mtod(rights, struct file **);
+       register struct cmsghdr *cm = mtod(rights, struct cmsghdr *);
+       register struct file **rp = (struct file **)(cm + 1);

        register struct file *fp;
        register struct file *fp;

+       int newfds = (cm->cmsg_len - sizeof(*cm)) / sizeof (int);

        int f;
 
        if (newfds > ufavail()) {
        int f;
 
        if (newfds > ufavail()) {


@@ -575,21 +570,26 @@ unp_externalize(rights)
        return (0);
 }
 
        return (0);
 }
 

-unp_internalize(rights)
-       struct mbuf *rights;
+unp_internalize(control)
+       struct mbuf *control;

 {
 {

+       register struct cmsghdr *cm = mtod(control, struct cmsghdr *);

        register struct file **rp;
        register struct file **rp;

-       int oldfds = rights->m_len / sizeof (int);
-       register int i, fd;

        register struct file *fp;
        register struct file *fp;

+       register int i, fd;
+       int oldfds;

 
 

-       rp = mtod(rights, struct file **);
+       if (cm->cmsg_type != SCM_RIGHTS || cm->cmsg_level != SOL_SOCKET ||
+           cm->cmsg_len != control->m_len)
+               return (EINVAL);
+       oldfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int);
+       rp = (struct file **)(cm + 1);

        for (i = 0; i < oldfds; i++) {
                fd = *(int *)rp++;
                if ((unsigned)fd >= NOFILE || u.u_ofile[fd] == NULL)
                        return (EBADF);
        }
        for (i = 0; i < oldfds; i++) {
                fd = *(int *)rp++;
                if ((unsigned)fd >= NOFILE || u.u_ofile[fd] == NULL)
                        return (EBADF);
        }

-       rp = mtod(rights, struct file **);
+       rp = (struct file **)(cm + 1);

        for (i = 0; i < oldfds; i++) {
                fp = u.u_ofile[*(int *)rp];
                *rp++ = fp;
        for (i = 0; i < oldfds; i++) {
                fp = u.u_ofile[*(int *)rp];
                *rp++ = fp;


@@ -668,14 +668,21 @@ unp_scan(m0, op)
 {
        register struct mbuf *m;
        register struct file **rp;
 {
        register struct mbuf *m;
        register struct file **rp;

+       register struct cmsghdr *cm;

        register int i;
        int qfds;
 
        while (m0) {
                for (m = m0; m; m = m->m_next)
        register int i;
        int qfds;
 
        while (m0) {
                for (m = m0; m; m = m->m_next)

-                       if (m->m_type == MT_RIGHTS && m->m_len) {
-                               qfds = m->m_len / sizeof (struct file *);
-                               rp = mtod(m, struct file **);
+                       if (m->m_type == MT_CONTROL &&
+                           m->m_len >= sizeof(*cm)) {
+                               cm = mtod(m, struct cmsghdr *);
+                               if (cm->cmsg_level != SOL_SOCKET ||
+                                   cm->cmsg_type != SCM_RIGHTS)
+                                       continue;
+                               qfds = (cm->cmsg_len - sizeof *cm)
+                                               / sizeof (struct file *);
+                               rp = (struct file **)(cm + 1);

                                for (i = 0; i < qfds; i++)
                                        (*op)(*rp++);
                                break;          /* XXX, but saves time */
                                for (i = 0; i < qfds; i++)
                                        (*op)(*rp++);
                                break;          /* XXX, but saves time */


@@ -700,5 +707,5 @@ unp_discard(fp)
 
        fp->f_msgcount--;
        unp_rights--;
 
        fp->f_msgcount--;
        unp_rights--;

-       closef(fp);
+       (void) closef(fp);

 }
 }