Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.215.4.2 retrieving revision 1.226 diff -u -p -r1.215.4.2 -r1.226 --- src/sys/kern/uipc_socket.c 2013/08/28 23:59:35 1.215.4.2 +++ src/sys/kern/uipc_socket.c 2014/07/23 13:17:18 1.226 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.215.4.2 2013/08/28 23:59:35 rmind Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.226 2014/07/23 13:17:18 rtr Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.215.4.2 2013/08/28 23:59:35 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.226 2014/07/23 13:17:18 rtr Exp $"); #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" @@ -423,7 +423,7 @@ socket_listener_cb(kauth_cred_t cred, ka /* Normal users can only drop their own connections. */ struct socket *so = (struct socket *)arg1; - if (proc_uidmatch(cred, so->so_cred) == 0) + if (so->so_cred && proc_uidmatch(cred, so->so_cred) == 0) result = KAUTH_RESULT_ALLOW; break; @@ -540,24 +540,28 @@ socreate(int dom, struct socket **aso, i so->so_cpid = l->l_proc->p_pid; /* - * Lock assigned and taken during pr_attach, unless we share + * Lock assigned and taken during PCB attach, unless we share * the lock with another socket, e.g. socketpair(2) case. */ if (lockso) { lock = lockso->so_lock; so->so_lock = lock; mutex_obj_hold(lock); + mutex_enter(lock); } + /* Attach the PCB (returns with the socket lock held). */ error = (*prp->pr_usrreqs->pr_attach)(so, proto); + KASSERT(solocked(so)); + if (error) { - solock(so); KASSERT(so->so_pcb == NULL); so->so_state |= SS_NOFDREF; sofree(so); return error; } so->so_cred = kauth_cred_dup(l->l_cred); + sounlock(so); *aso = so; return 0; @@ -570,7 +574,7 @@ socreate(int dom, struct socket **aso, i * => On failure, return non-zero; *fdout will be undefined. */ int -fsocreate(int domain, struct socket **sop, int type, int protocol, int *fdout) +fsocreate(int domain, struct socket **sop, int type, int proto, int *fdout) { lwp_t *l = curlwp; int error, fd, flags; @@ -580,7 +584,6 @@ fsocreate(int domain, struct socket **so if ((error = fd_allocfile(&fp, &fd)) != 0) { return error; } - flags = type & SOCK_FLAGS_MASK; fd_set_exclose(l, fd, (flags & SOCK_CLOEXEC) != 0); fp->f_flag = FREAD|FWRITE|((flags & SOCK_NONBLOCK) ? FNONBLOCK : 0)| @@ -589,17 +592,17 @@ fsocreate(int domain, struct socket **so fp->f_ops = &socketops; type &= ~SOCK_FLAGS_MASK; - error = socreate(domain, &so, type, protocol, l, NULL); - if (error != 0) { + error = socreate(domain, &so, type, proto, l, NULL); + if (error) { fd_abort(curproc, fp, fd); return error; } if (flags & SOCK_NONBLOCK) { so->so_state |= SS_NBIO; } - fp->f_data = so; fd_affix(curproc, fp, fd); + if (sop != NULL) { *sop = so; } @@ -623,7 +626,7 @@ sofamily(const struct socket *so) int sobind(struct socket *so, struct mbuf *nam, struct lwp *l) { - int error; + int error; solock(so); error = (*so->so_proto->pr_usrreqs->pr_generic)(so, @@ -635,16 +638,16 @@ sobind(struct socket *so, struct mbuf *n int solisten(struct socket *so, int backlog, struct lwp *l) { - int error; + int error; solock(so); if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) != 0) { sounlock(so); - return (EINVAL); + return EINVAL; } - error = (*so->so_proto->pr_usrreqs->pr_generic)(so, PRU_LISTEN, NULL, - NULL, NULL, l); + error = (*so->so_proto->pr_usrreqs->pr_generic)(so, + PRU_LISTEN, NULL, NULL, NULL, l); if (error != 0) { sounlock(so); return error; @@ -708,9 +711,8 @@ int soclose(struct socket *so) { struct socket *so2; - int error; + int error = 0; - error = 0; solock(so); if (so->so_options & SO_ACCEPTCONN) { for (;;) { @@ -754,6 +756,7 @@ soclose(struct socket *so) } drop: if (so->so_pcb) { + KASSERT(solocked(so)); (*so->so_proto->pr_usrreqs->pr_detach)(so); } discard: @@ -791,22 +794,19 @@ soabort(struct socket *so) int soaccept(struct socket *so, struct mbuf *nam) { - int error; + int error; KASSERT(solocked(so)); - - error = 0; KASSERT((so->so_state & SS_NOFDREF) != 0); - so->so_state &= ~SS_NOFDREF; + so->so_state &= ~SS_NOFDREF; if ((so->so_state & SS_ISDISCONNECTED) == 0 || (so->so_proto->pr_flags & PR_ABRTACPTDIS) == 0) - error = (*so->so_proto->pr_usrreqs->pr_generic)(so, - PRU_ACCEPT, NULL, nam, NULL, NULL); + error = (*so->so_proto->pr_usrreqs->pr_accept)(so, nam); else error = ECONNABORTED; - return (error); + return error; } int @@ -817,7 +817,7 @@ soconnect(struct socket *so, struct mbuf KASSERT(solocked(so)); if (so->so_options & SO_ACCEPTCONN) - return (EOPNOTSUPP); + return EOPNOTSUPP; /* * If protocol is connection-based, can only connect once. * Otherwise, if connected, try to disconnect first. @@ -838,13 +838,10 @@ soconnect(struct socket *so, struct mbuf int soconnect2(struct socket *so1, struct socket *so2) { - int error; - KASSERT(solocked2(so1, so2)); - error = (*so1->so_proto->pr_usrreqs->pr_generic)(so1, PRU_CONNECT2, - NULL, (struct mbuf *)so2, NULL, NULL); - return (error); + return (*so1->so_proto->pr_usrreqs->pr_generic)(so1, + PRU_CONNECT2, NULL, (struct mbuf *)so2, NULL, NULL); } int @@ -938,8 +935,7 @@ sosend(struct socket *so, struct mbuf *a } if ((so->so_state & SS_ISCONNECTED) == 0) { if (so->so_proto->pr_flags & PR_CONNREQUIRED) { - if ((so->so_state & SS_ISCONFIRMING) == 0 && - !(resid == 0 && clen != 0)) { + if (resid || clen == 0) { error = ENOTCONN; goto release; } @@ -1057,9 +1053,12 @@ sosend(struct socket *so, struct mbuf *a so->so_options |= SO_DONTROUTE; if (resid > 0) so->so_state |= SS_MORETOCOME; - error = (*so->so_proto->pr_usrreqs->pr_generic)(so, - (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND, - top, addr, control, curlwp); + if (flags & MSG_OOB) + error = (*so->so_proto->pr_usrreqs->pr_sendoob)(so, + top, control); + else + error = (*so->so_proto->pr_usrreqs->pr_generic)(so, + PRU_SEND, top, addr, control, curlwp); if (dontroute) so->so_options &= ~SO_DONTROUTE; if (resid > 0) @@ -1171,8 +1170,7 @@ soreceive(struct socket *so, struct mbuf if (flags & MSG_OOB) { m = m_get(M_WAIT, MT_DATA); solock(so); - error = (*pr->pr_usrreqs->pr_generic)(so, PRU_RCVOOB, m, - (struct mbuf *)(long)(flags & MSG_PEEK), NULL, l); + error = (*pr->pr_usrreqs->pr_recvoob)(so, m, flags & MSG_PEEK); sounlock(so); if (error) goto bad; @@ -1196,9 +1194,6 @@ soreceive(struct socket *so, struct mbuf */ s = splsoftnet(); solock(so); - if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) - (*pr->pr_usrreqs->pr_generic)(so, PRU_RCVD, NULL, NULL, NULL, l); - restart: if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) { sounlock(so); @@ -1619,8 +1614,8 @@ soshutdown(struct socket *so, int how) error = 0; } if (how == SHUT_WR || how == SHUT_RDWR) - error = (*pr->pr_usrreqs->pr_generic)(so, PRU_SHUTDOWN, NULL, - NULL, NULL, NULL); + error = (*pr->pr_usrreqs->pr_generic)(so, + PRU_SHUTDOWN, NULL, NULL, NULL, NULL); return error; } @@ -1679,7 +1674,8 @@ sorflush(struct socket *so) static int sosetopt1(struct socket *so, const struct sockopt *sopt) { - int error = EINVAL, optval, opt; + int error = EINVAL, opt; + int optval = 0; /* XXX: gcc */ struct linger l; struct timeval tv; @@ -1921,6 +1917,7 @@ sogetopt1(struct socket *so, struct sock #ifdef SO_OTIMESTAMP case SO_OTIMESTAMP: #endif + case SO_ACCEPTCONN: error = sockopt_setint(sopt, (so->so_options & opt) ? 1 : 0); break; @@ -2438,11 +2435,6 @@ sysctl_kern_socket_setup(void) { KASSERT(socket_sysctllog == NULL); - sysctl_createv(&socket_sysctllog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "kern", NULL, - NULL, 0, NULL, 0, - CTL_KERN, CTL_EOL); sysctl_createv(&socket_sysctllog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE,