diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_mbuf2.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_socket.c | 6 | ||||
| -rw-r--r-- | sys/kern/uipc_socket2.c | 4 | ||||
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index ec63e3e764b..c133861834b 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf2.c,v 1.40 2014/12/11 19:21:57 tedu Exp $ */ +/* $OpenBSD: uipc_mbuf2.c,v 1.41 2015/06/30 15:30:17 mpi Exp $ */ /* $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */ @@ -175,7 +175,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp) } /* - * now, we need to do the hard way. don't m_copy as there's no room + * now, we need to do the hard way. don't m_copym as there's no room * on both ends. */ if (len > MAXMCLBYTES) { diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 808653cb06b..2ab84530751 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.139 2015/06/16 11:09:39 mpi Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.140 2015/06/30 15:30:17 mpi Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -751,7 +751,7 @@ dontblock: orig_resid = 0; if (flags & MSG_PEEK) { if (paddr) - *paddr = m_copy(m, 0, m->m_len); + *paddr = m_copym(m, 0, m->m_len, M_NOWAIT); m = m->m_next; } else { sbfree(&so->so_rcv, m); @@ -770,7 +770,7 @@ dontblock: while (m && m->m_type == MT_CONTROL && error == 0) { if (flags & MSG_PEEK) { if (controlp) - *controlp = m_copy(m, 0, m->m_len); + *controlp = m_copym(m, 0, m->m_len, M_NOWAIT); m = m->m_next; } else { sbfree(&so->so_rcv, m); diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index eb6c7ee6bf1..49e9ccc5492 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.60 2015/03/14 03:38:51 jsg Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.61 2015/06/30 15:30:17 mpi Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -452,7 +452,7 @@ sbrelease(struct sockbuf *sb) * * Reliable protocols may use the socket send buffer to hold data * awaiting acknowledgement. Data is normally copied from a socket - * send buffer in a protocol with m_copy for output to a peer, + * send buffer in a protocol with m_copym for output to a peer, * and then removing the data from the socket buffer with sbdrop() * or sbdroprecord() when the data is acknowledged by the peer. */ diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1dbe967a268..17631ed75bd 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.80 2015/03/28 23:50:55 bluhm Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.81 2015/06/30 15:30:17 mpi Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -525,7 +525,7 @@ unp_connect(struct socket *so, struct mbuf *nam, struct proc *p) unp3 = sotounpcb(so3); if (unp2->unp_addr) unp3->unp_addr = - m_copy(unp2->unp_addr, 0, (int)M_COPYALL); + m_copym(unp2->unp_addr, 0, M_COPYALL, M_NOWAIT); unp3->unp_connid.uid = p->p_ucred->cr_uid; unp3->unp_connid.gid = p->p_ucred->cr_gid; unp3->unp_connid.pid = p->p_p->ps_pid; |