D18623.id52840.diff
No OneTemporary
Actions

Size

876 B

Referenced Files

None

Subscribers

None

D18623.id52840.diff
View Options

	Index: sys/kern/kern_sendfile.c
	===================================================================
	--- sys/kern/kern_sendfile.c
	+++ sys/kern/kern_sendfile.c
	@@ -1007,8 +1007,22 @@
	uap->nbytes, &sbytes, uap->flags, td);
	fdrop(fp, td);

	- if (uap->sbytes != NULL)
	- copyout(&sbytes, uap->sbytes, sizeof(off_t));
	+ /*
	+ * Only copy out the number of bytes if fo_sendfile did not fail, or
	+ * if it failed with EAGAIN, EBUSY, or EINTR.
	+ */
	+ if (uap->sbytes != NULL &&
	+ (error == 0 \|\| error == EAGAIN \|\| error == EBUSY \|\|
	+ error == EINTR)) {
	+ int copyout_error;
	+
	+ copyout_error = copyout(&sbytes, uap->sbytes, sizeof(off_t));
	+ /*
	+ * Ensure that copyout's error doesn't mask an existing error
	+ * (EAGAIN, etc), if the operation was successful.
	+ */
	+ error = copyout_error != 0 ? copyout_error : error;
	+ }

	out:
	free(hdr_uio, M_IOV);