d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed broken code in sendfile(2) when using file offsets.

Browse Source
This commit is contained in:
David Greenman 1998-12-03 12:35:47 +00:00
parent c918f6386e
commit 911e8dbc2a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=41484
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/uipc_syscalls.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94
* $Id: uipc_syscalls.c,v 1.46 1998/11/18 09:00:47 dg Exp $
* $Id: uipc_syscalls.c,v 1.47 1998/11/23 00:45:39 truckman Exp $
*/
#include "opt_compat.h"
@ -1494,6 +1494,7 @@ sendfile(struct proc *p, struct sendfile_args *uap)
*/
for (off = uap->offset; ; off += xfsize, sbytes += xfsize) {
vm_pindex_t pindex;
vm_offset_t pgoff;
pindex = OFF_TO_IDX(off);
retry_lookup:
@ -1504,8 +1505,9 @@ sendfile(struct proc *p, struct sendfile_args *uap)
xfsize = obj->un_pager.vnp.vnp_size - off;
if (xfsize > PAGE_SIZE)
xfsize = PAGE_SIZE;
if (off & PAGE_MASK)
xfsize -= (off & PAGE_MASK);
pgoff = (vm_offset_t)(off & PAGE_MASK);
if (PAGE_SIZE - pgoff < xfsize)
xfsize = PAGE_SIZE - pgoff;
if (uap->nbytes && xfsize > (uap->nbytes - sbytes))
xfsize = uap->nbytes - sbytes;
if (xfsize <= 0)
@ -1530,7 +1532,7 @@ sendfile(struct proc *p, struct sendfile_args *uap)
*/
pg = vm_page_lookup(obj, pindex);
if (pg == NULL || (!(pg->flags & PG_BUSY) && !pg->busy &&
!vm_page_is_valid(pg, off & PAGE_MASK, xfsize))) {
!vm_page_is_valid(pg, pgoff, xfsize))) {
struct uio auio;
struct iovec aiov;
int bsize;
@ -1614,7 +1616,7 @@ sendfile(struct proc *p, struct sendfile_args *uap)
m->m_ext.ext_ref = sf_buf_ref;
m->m_ext.ext_buf = (void *)sf->kva;
m->m_ext.ext_size = PAGE_SIZE;
m->m_data = (char *) sf->kva + (off & PAGE_MASK);
m->m_data = (char *) sf->kva + pgoff;
m->m_flags |= M_EXT;
m->m_pkthdr.len = m->m_len = xfsize;
/*