xnu-6153.81.5.tar.gz

[apple/xnu.git] / bsd / kern / sys_socket.c

diff --git a/bsd/kern/sys_socket.c b/bsd/kern/sys_socket.c
index 11df996b60e4257aacd8629b67fe8ca8a3f926b9..53e8f07b58167e89ee3b2261893b2fcf61fb962a 100644 (file)
--- a/bsd/kern/sys_socket.c
+++ b/bsd/kern/sys_socket.c
@@ -73,7 +73,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>

-#include <sys/filio.h>                 /* XXX */
+#include <sys/filio.h>                  /* XXX */

 #include <sys/sockio.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/sockio.h>
 #include <sys/stat.h>
 #include <sys/uio.h>


@@ -98,23 +98,23 @@ static int soo_close(struct fileglob *, vfs_context_t ctx);
 static int soo_drain(struct fileproc *, vfs_context_t ctx);
 
 const struct fileops socketops = {
 static int soo_drain(struct fileproc *, vfs_context_t ctx);
 
 const struct fileops socketops = {

-       DTYPE_SOCKET,
-       soo_read,
-       soo_write,
-       soo_ioctl,
-       soo_select,
-       soo_close,
-       soo_kqfilter,
-       soo_drain
+       .fo_type     = DTYPE_SOCKET,
+       .fo_read     = soo_read,
+       .fo_write    = soo_write,
+       .fo_ioctl    = soo_ioctl,
+       .fo_select   = soo_select,
+       .fo_close    = soo_close,
+       .fo_drain    = soo_drain,
+       .fo_kqfilter = soo_kqfilter,

 };
 
 /* ARGSUSED */
 static int
 soo_read(struct fileproc *fp, struct uio *uio, __unused int flags,
 #if !CONFIG_MACF_SOCKET
 };
 
 /* ARGSUSED */
 static int
 soo_read(struct fileproc *fp, struct uio *uio, __unused int flags,
 #if !CONFIG_MACF_SOCKET

-       __unused
+    __unused

 #endif
 #endif

-       vfs_context_t ctx)
+    vfs_context_t ctx)

 {
        struct socket *so;
        int stat;
 {
        struct socket *so;
        int stat;


@@ -128,25 +128,26 @@ soo_read(struct fileproc *fp, struct uio *uio, __unused int flags,
 
        if ((so = (struct socket *)fp->f_fglob->fg_data) == NULL) {
                /* This is not a valid open file descriptor */
 
        if ((so = (struct socket *)fp->f_fglob->fg_data) == NULL) {
                /* This is not a valid open file descriptor */

-               return (EBADF);
+               return EBADF;

        }
 
 #if CONFIG_MACF_SOCKET
        error = mac_socket_check_receive(vfs_context_ucred(ctx), so);
        }
 
 #if CONFIG_MACF_SOCKET
        error = mac_socket_check_receive(vfs_context_ucred(ctx), so);

-       if (error)
-               return (error);
+       if (error) {
+               return error;
+       }

 #endif /* CONFIG_MACF_SOCKET */
 
        fsoreceive = so->so_proto->pr_usrreqs->pru_soreceive;
 
        stat = (*fsoreceive)(so, 0, uio, 0, 0, 0);
 #endif /* CONFIG_MACF_SOCKET */
 
        fsoreceive = so->so_proto->pr_usrreqs->pru_soreceive;
 
        stat = (*fsoreceive)(so, 0, uio, 0, 0, 0);

-       return (stat);
+       return stat;

 }
 
 /* ARGSUSED */
 static int
 soo_write(struct fileproc *fp, struct uio *uio, __unused int flags,
 }
 
 /* ARGSUSED */
 static int
 soo_write(struct fileproc *fp, struct uio *uio, __unused int flags,

-       vfs_context_t ctx)
+    vfs_context_t ctx)

 {
        struct socket *so;
        int stat;
 {
        struct socket *so;
        int stat;


@@ -161,14 +162,15 @@ soo_write(struct fileproc *fp, struct uio *uio, __unused int flags,
 
        if ((so = (struct socket *)fp->f_fglob->fg_data) == NULL) {
                /* This is not a valid open file descriptor */
 
        if ((so = (struct socket *)fp->f_fglob->fg_data) == NULL) {
                /* This is not a valid open file descriptor */

-               return (EBADF);
+               return EBADF;

        }
 
 #if CONFIG_MACF_SOCKET
        /* JMM - have to fetch the socket's remote addr */
        error = mac_socket_check_send(vfs_context_ucred(ctx), so, NULL);
        }
 
 #if CONFIG_MACF_SOCKET
        /* JMM - have to fetch the socket's remote addr */
        error = mac_socket_check_send(vfs_context_ucred(ctx), so, NULL);

-       if (error)
-               return (error);
+       if (error) {
+               return error;
+       }

 #endif /* CONFIG_MACF_SOCKET */
 
        fsosend = so->so_proto->pr_usrreqs->pru_sosend;
 #endif /* CONFIG_MACF_SOCKET */
 
        fsosend = so->so_proto->pr_usrreqs->pru_sosend;


@@ -177,10 +179,11 @@ soo_write(struct fileproc *fp, struct uio *uio, __unused int flags,
 
        /* Generation of SIGPIPE can be controlled per socket */
        procp = vfs_context_proc(ctx);
 
        /* Generation of SIGPIPE can be controlled per socket */
        procp = vfs_context_proc(ctx);

-       if (stat == EPIPE && !(so->so_flags & SOF_NOSIGPIPE))
+       if (stat == EPIPE && !(so->so_flags & SOF_NOSIGPIPE)) {

                psignal(procp, SIGPIPE);
                psignal(procp, SIGPIPE);

+       }

 
 

-       return (stat);
+       return stat;

 }
 
 __private_extern__ int
 }
 
 __private_extern__ int


@@ -189,6 +192,13 @@ soioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
        int error = 0;
        int int_arg;
 
        int error = 0;
        int int_arg;
 

+#if CONFIG_MACF_SOCKET_SUBSET
+       error = mac_socket_check_ioctl(kauth_cred_get(), so, cmd);
+       if (error) {
+               return error;
+       }
+#endif
+

        socket_lock(so, 1);
 
        /* call the socket filter's ioctl handler anything but ours */
        socket_lock(so, 1);
 
        /* call the socket filter's ioctl handler anything but ours */


@@ -207,24 +217,26 @@ soioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
 
                default:
                        error = sflt_ioctl(so, cmd, data);
 
                default:
                        error = sflt_ioctl(so, cmd, data);

-                       if (error != 0)
+                       if (error != 0) {

                                goto out;
                                goto out;

+                       }

                        break;
                }
        }
 
        switch (cmd) {
                        break;
                }
        }
 
        switch (cmd) {

-       case FIONBIO:                   /* int */
-               bcopy(data, &int_arg, sizeof (int_arg));
-               if (int_arg)
+       case FIONBIO:                   /* int */
+               bcopy(data, &int_arg, sizeof(int_arg));
+               if (int_arg) {

                        so->so_state |= SS_NBIO;
                        so->so_state |= SS_NBIO;

-               else
+               } else {

                        so->so_state &= ~SS_NBIO;
                        so->so_state &= ~SS_NBIO;

+               }

 
                goto out;
 
 
                goto out;
 

-       case FIOASYNC:                  /* int */
-               bcopy(data, &int_arg, sizeof (int_arg));
+       case FIOASYNC:                  /* int */
+               bcopy(data, &int_arg, sizeof(int_arg));

                if (int_arg) {
                        so->so_state |= SS_ASYNC;
                        so->so_rcv.sb_flags |= SB_ASYNC;
                if (int_arg) {
                        so->so_state |= SS_ASYNC;
                        so->so_rcv.sb_flags |= SB_ASYNC;


@@ -236,35 +248,35 @@ soioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
                }
                goto out;
 
                }
                goto out;
 

-       case FIONREAD:                  /* int */
-               bcopy(&so->so_rcv.sb_cc, data, sizeof (u_int32_t));
+       case FIONREAD:                  /* int */
+               bcopy(&so->so_rcv.sb_cc, data, sizeof(u_int32_t));

                goto out;
 
                goto out;
 

-       case SIOCSPGRP:                 /* int */
-               bcopy(data, &so->so_pgid, sizeof (pid_t));
+       case SIOCSPGRP:                 /* int */
+               bcopy(data, &so->so_pgid, sizeof(pid_t));

                goto out;
 
                goto out;
 

-       case SIOCGPGRP:                 /* int */
-               bcopy(&so->so_pgid, data, sizeof (pid_t));
+       case SIOCGPGRP:                 /* int */
+               bcopy(&so->so_pgid, data, sizeof(pid_t));

                goto out;
 
                goto out;
 

-       case SIOCATMARK:                /* int */
+       case SIOCATMARK:                /* int */

                int_arg = (so->so_state & SS_RCVATMARK) != 0;
                int_arg = (so->so_state & SS_RCVATMARK) != 0;

-               bcopy(&int_arg, data, sizeof (int_arg));
+               bcopy(&int_arg, data, sizeof(int_arg));

                goto out;
 
                goto out;
 

-       case SIOCSETOT:                 /* int; deprecated */
+       case SIOCSETOT:                 /* int; deprecated */

                error = EOPNOTSUPP;
                goto out;
 
                error = EOPNOTSUPP;
                goto out;
 

-       case SIOCGASSOCIDS32:           /* so_aidreq32 */
-       case SIOCGASSOCIDS64:           /* so_aidreq64 */
-       case SIOCGCONNIDS32:            /* so_cidreq32 */
-       case SIOCGCONNIDS64:            /* so_cidreq64 */
-       case SIOCGCONNINFO32:           /* so_cinforeq32 */
-       case SIOCGCONNINFO64:           /* so_cinforeq64 */
-       case SIOCSCONNORDER:            /* so_cordreq */
-       case SIOCGCONNORDER:            /* so_cordreq */
+       case SIOCGASSOCIDS32:           /* so_aidreq32 */
+       case SIOCGASSOCIDS64:           /* so_aidreq64 */
+       case SIOCGCONNIDS32:            /* so_cidreq32 */
+       case SIOCGCONNIDS64:            /* so_cidreq64 */
+       case SIOCGCONNINFO32:           /* so_cinforeq32 */
+       case SIOCGCONNINFO64:           /* so_cinforeq64 */
+       case SIOCSCONNORDER:            /* so_cordreq */
+       case SIOCGCONNORDER:            /* so_cordreq */

                error = (*so->so_proto->pr_usrreqs->pru_control)(so,
                    cmd, data, NULL, p);
                goto out;
                error = (*so->so_proto->pr_usrreqs->pru_control)(so,
                    cmd, data, NULL, p);
                goto out;


@@ -278,20 +290,22 @@ soioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
        if (IOCGROUP(cmd) == 'i') {
                error = ifioctllocked(so, cmd, data, p);
        } else {
        if (IOCGROUP(cmd) == 'i') {
                error = ifioctllocked(so, cmd, data, p);
        } else {

-               if (IOCGROUP(cmd) == 'r')
+               if (IOCGROUP(cmd) == 'r') {

                        error = rtioctl(cmd, data, p);
                        error = rtioctl(cmd, data, p);

-               else
+               } else {

                        error = (*so->so_proto->pr_usrreqs->pru_control)(so,
                            cmd, data, NULL, p);
                        error = (*so->so_proto->pr_usrreqs->pru_control)(so,
                            cmd, data, NULL, p);

+               }

        }
 
 out:
        socket_unlock(so, 1);
 
        }
 
 out:
        socket_unlock(so, 1);
 

-       if (error == EJUSTRETURN)
+       if (error == EJUSTRETURN) {

                error = 0;
                error = 0;

+       }

 
 

-       return (error);
+       return error;

 }
 
 int
 }
 
 int


@@ -302,10 +316,10 @@ soo_ioctl(struct fileproc *fp, u_long cmd, caddr_t data, vfs_context_t ctx)
 
        if ((so = (struct socket *)fp->f_fglob->fg_data) == NULL) {
                /* This is not a valid open file descriptor */
 
        if ((so = (struct socket *)fp->f_fglob->fg_data) == NULL) {
                /* This is not a valid open file descriptor */

-               return (EBADF);
+               return EBADF;

        }
 
        }
 

-       return (soioctl(so, cmd, data, procp));
+       return soioctl(so, cmd, data, procp);

 }
 
 int
 }
 
 int


@@ -315,20 +329,21 @@ soo_select(struct fileproc *fp, int which, void *wql, vfs_context_t ctx)
        int retnum = 0;
        proc_t procp;
 
        int retnum = 0;
        proc_t procp;
 

-       if (so == NULL || so == (struct socket *)-1)
-               return (0);
+       if (so == NULL || so == (struct socket *)-1) {
+               return 0;
+       }

 
        procp = vfs_context_proc(ctx);
 
 #if CONFIG_MACF_SOCKET
 
        procp = vfs_context_proc(ctx);
 
 #if CONFIG_MACF_SOCKET

-       if (mac_socket_check_select(vfs_context_ucred(ctx), so, which) != 0)
-               return (0);
+       if (mac_socket_check_select(vfs_context_ucred(ctx), so, which) != 0) {
+               return 0;
+       }

 #endif /* CONFIG_MACF_SOCKET */
 
 
        socket_lock(so, 1);
        switch (which) {
 #endif /* CONFIG_MACF_SOCKET */
 
 
        socket_lock(so, 1);
        switch (which) {

-

        case FREAD:
                so->so_rcv.sb_flags |= SB_SEL;
                if (soreadable(so)) {
        case FREAD:
                so->so_rcv.sb_flags |= SB_SEL;
                if (soreadable(so)) {


@@ -362,7 +377,7 @@ soo_select(struct fileproc *fp, int which, void *wql, vfs_context_t ctx)
 
 done:
        socket_unlock(so, 1);
 
 done:
        socket_unlock(so, 1);

-       return (retnum);
+       return retnum;

 }
 
 int
 }
 
 int


@@ -374,38 +389,43 @@ soo_stat(struct socket *so, void *ub, int isstat64)
        /* warning avoidance ; protected by isstat64 */
        struct stat64 *sb64 = (struct stat64 *)0;
 
        /* warning avoidance ; protected by isstat64 */
        struct stat64 *sb64 = (struct stat64 *)0;
 

-#if CONFIG_MACF_SOCKET
+#if CONFIG_MACF_SOCKET_SUBSET

        ret = mac_socket_check_stat(kauth_cred_get(), so);
        ret = mac_socket_check_stat(kauth_cred_get(), so);

-       if (ret)
-               return (ret);
+       if (ret) {
+               return ret;
+       }

 #endif
 
        if (isstat64 != 0) {
                sb64 = (struct stat64 *)ub;
 #endif
 
        if (isstat64 != 0) {
                sb64 = (struct stat64 *)ub;

-               bzero((caddr_t)sb64, sizeof (*sb64));
+               bzero((caddr_t)sb64, sizeof(*sb64));

        } else {
                sb = (struct stat *)ub;
        } else {
                sb = (struct stat *)ub;

-               bzero((caddr_t)sb, sizeof (*sb));
+               bzero((caddr_t)sb, sizeof(*sb));

        }
 
        socket_lock(so, 1);
        if (isstat64 != 0) {
                sb64->st_mode = S_IFSOCK;
                if ((so->so_state & SS_CANTRCVMORE) == 0 ||
        }
 
        socket_lock(so, 1);
        if (isstat64 != 0) {
                sb64->st_mode = S_IFSOCK;
                if ((so->so_state & SS_CANTRCVMORE) == 0 ||

-                   so->so_rcv.sb_cc != 0)
+                   so->so_rcv.sb_cc != 0) {

                        sb64->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
                        sb64->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;

-               if ((so->so_state & SS_CANTSENDMORE) == 0)
+               }
+               if ((so->so_state & SS_CANTSENDMORE) == 0) {

                        sb64->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
                        sb64->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;

+               }

                sb64->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl;
                sb64->st_uid = kauth_cred_getuid(so->so_cred);
                sb64->st_gid = kauth_cred_getgid(so->so_cred);
        } else {
                sb->st_mode = S_IFSOCK;
                if ((so->so_state & SS_CANTRCVMORE) == 0 ||
                sb64->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl;
                sb64->st_uid = kauth_cred_getuid(so->so_cred);
                sb64->st_gid = kauth_cred_getgid(so->so_cred);
        } else {
                sb->st_mode = S_IFSOCK;
                if ((so->so_state & SS_CANTRCVMORE) == 0 ||

-                   so->so_rcv.sb_cc != 0)
+                   so->so_rcv.sb_cc != 0) {

                        sb->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
                        sb->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;

-               if ((so->so_state & SS_CANTSENDMORE) == 0)
+               }
+               if ((so->so_state & SS_CANTSENDMORE) == 0) {

                        sb->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
                        sb->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;

+               }

                sb->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl;
                sb->st_uid = kauth_cred_getuid(so->so_cred);
                sb->st_gid = kauth_cred_getgid(so->so_cred);
                sb->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl;
                sb->st_uid = kauth_cred_getuid(so->so_cred);
                sb->st_gid = kauth_cred_getgid(so->so_cred);


@@ -413,7 +433,7 @@ soo_stat(struct socket *so, void *ub, int isstat64)
 
        ret = (*so->so_proto->pr_usrreqs->pru_sense)(so, ub, isstat64);
        socket_unlock(so, 1);
 
        ret = (*so->so_proto->pr_usrreqs->pru_sense)(so, ub, isstat64);
        socket_unlock(so, 1);

-       return (ret);
+       return ret;

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -426,10 +446,11 @@ soo_close(struct fileglob *fg, __unused vfs_context_t ctx)
        sp = (struct socket *)fg->fg_data;
        fg->fg_data = NULL;
 
        sp = (struct socket *)fg->fg_data;
        fg->fg_data = NULL;
 

-       if (sp)
+       if (sp) {

                error = soclose(sp);
                error = soclose(sp);

+       }

 
 

-       return (error);
+       return error;

 }
 
 static int
 }
 
 static int


@@ -450,7 +471,7 @@ soo_drain(struct fileproc *fp, __unused vfs_context_t ctx)
                socket_unlock(so, 1);
        }
 
                socket_unlock(so, 1);
        }
 

-       return (error);
+       return error;

 }
 
 /*
 }
 
 /*