Sendfile is documented to return 0 on success, however if when a

sf_hdtr is used to provide writev(2) style headers/trailers on the
sent data the return value is actually either the result of writev(2)
from the trailers or headers of no tailers are specified.

Fix sendfile to comply with the documentation, by returning 0 on
success.

Ok'd by: dg

1 files changed, 7 insertions, 0 deletions

diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 33f7902916b6..74e1dc6bf1ba 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1832,6 +1832,13 @@ retry_space:
 	}
 
 done:
+	/*
+	 * If there was no error we have to clear p->p_retval[0]
+	 * because it may have been set by writev.
+	 */
+	if (error == 0) {
+		p->p_retval[0] = 0;
+	}
 	if (uap->sbytes != NULL) {
 		copyout(&sbytes, uap->sbytes, sizeof(off_t));
 	}