diff options
| author | glebius <glebius@FreeBSD.org> | 2013-03-12 12:15:24 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-03-12 12:15:24 +0000 |
| commit | 89cbb92630b48fdd00ee0d5773899bcfa0726a5a (patch) | |
| tree | 5ea20627eda63caee6fee00449825823aed66f2c | |
| parent | ce515e6007c76b0ec23c6cce28f5d22c61219656 (diff) | |
| download | FreeBSD-src-89cbb92630b48fdd00ee0d5773899bcfa0726a5a.zip FreeBSD-src-89cbb92630b48fdd00ee0d5773899bcfa0726a5a.tar.gz | |
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.
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index a262306..4827cab 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -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; |
