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

Fix a bug in sendfile(2) when files larger than page size and nbytes=0.

Browse Source 
When nbytes=0, sendfile(2) should use file size. Because of the bug, it
was sending half of a file. The bug is that 'off' variable can't be used
for size calculation, because it changes inside the loop, so we should
use uap->offset instead.
This commit is contained in:
Pawel Jakub Dawidek 2007-04-19 05:54:45 +00:00
parent f40fd96d5b
commit fb1daf8164
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=168853
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/uipc_syscalls.c
View File

@ -2016,12 +2016,12 @@ kern_sendfile(struct thread *td, struct sendfile_args *uap,
*/
pgoff = (vm_offset_t)(off & PAGE_MASK);
xfsize = omin(PAGE_SIZE - pgoff,
obj->un_pager.vnp.vnp_size - off -
obj->un_pager.vnp.vnp_size - uap->offset -
sbytes - loopbytes);
if (uap->nbytes)
rem = (uap->nbytes - sbytes - loopbytes);
else
rem = obj->un_pager.vnp.vnp_size - off -
rem = obj->un_pager.vnp.vnp_size - uap->offset -
sbytes - loopbytes;
xfsize = omin(rem, xfsize);
if (xfsize <= 0) {