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

Fixed a bug in sendfile(2) where the sent data would be corrupted due

Browse Source 
to sendfile(2) being erroneously automatically restarted after a signal
is delivered. Fixed by converting ERESTART to EINTR prior to exiting.

Updated manual page to indicate the potential EINTR error, its cause
and consequences.

Approved by: re@freebsd.org
This commit is contained in:
David Greenman 2003-12-01 22:12:50 +00:00
parent 90bc0f9dcd
commit 186e347f2c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libc/sys/sendfile.2
View File

@ -1,4 +1,4 @@
.\" Copyright (c) 1998, David Greenman
.\" Copyright (c) 2003, David G. Lawrence
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@ -191,6 +191,10 @@ An error occurred while reading from
.Fa fd .
.It Bq Er EFAULT
An invalid address was specified for an argument.
.It Bq Er EINTR
A signal interrupted sendfile before it could be completed. If specified, the number
of bytes successfully sent will be returned in
.Fa *sbytes .
.It Bq Er EAGAIN
The socket is marked for non-blocking I/O and not all data was sent due to the socket buffer being filled.
If specified, the number of bytes successfully sent will be returned in
@ -215,4 +219,4 @@ The
.Fn sendfile
system call
and this manual page were written by
.An David Greenman Aq dg@root.com .
.An David G. Lawrence Aq dg@dglawrence.com .

5
sys/kern/uipc_syscalls.c
View File

@ -1994,6 +1994,11 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
vrele(vp);
if (so)
fputsock(so);
mtx_unlock(&Giant);
if (error == ERESTART)
error = EINTR;
return (error);
}