Author: glebius
Date: Tue Mar 12 12:15:24 2013
New Revision: 248194
URL: http://svnweb.freebsd.org/changeset/base/248194
Log:
In kern_sendfile() use m_extadd() instead of MEXTADD() macro, supplying
appropriate wait argument and checking return value. Before this change
m_extadd() could fail, and kern_sendfile() ignored that.
Sponsored by: Nginx, Inc.
Modified:
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c Tue Mar 12 12:12:16 2013
(r248193)
+++ head/sys/kern/uipc_syscalls.c Tue Mar 12 12:15:24 2013
(r248194)
@@ -2222,8 +2222,14 @@ retry_space:
sf_buf_mext((void *)sf_buf_kva(sf), sf);
break;
}
- MEXTADD(m0, sf_buf_kva(sf), PAGE_SIZE, sf_buf_mext,
- sfs, sf, M_RDONLY, EXT_SFBUF);
+ if (m_extadd(m0, (caddr_t )sf_buf_kva(sf), PAGE_SIZE,
+ sf_buf_mext, sfs, sf, M_RDONLY, EXT_SFBUF,
+ (mnw ? M_NOWAIT : M_WAITOK)) != 0) {
+ error = (mnw ? EAGAIN : ENOBUFS);
+ sf_buf_mext((void *)sf_buf_kva(sf), sf);
+ m_freem(m0);
+ break;
+ }
m0->m_data = (char *)sf_buf_kva(sf) + pgoff;
m0->m_len = xfsize;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
