Attachment 15400 Details for Bug 14095 – FreeBSD sys_sendfile() fix - patch

[patch] FreeBSD sys_sendfile() fix - patch

patch-source3-lib-sendfile.c.patch (text/plain), 2.34 KB, created by Jesse Miller on 2019-08-19 21:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Miller

Created: 2019-08-19 21:10:04 UTC

Size: 2.34 KB

patch

obsolete

>diff --git source3/lib/sendfile.c source3/lib/sendfile.c
>index d3effaf30aa..d791d46e92f 100644
>--- source3/lib/sendfile.c
>+++ source3/lib/sendfile.c
>@@ -409,7 +409,8 @@ ssize_t sys_sendfile(int tofd, int fromfd,
> 
> 	off_t	nwritten;
> 	ssize_t	ret = -1;
>-	bool socket_flags_changed = false;
>+	size_t twritten = 0;
>+
> 
> 	if (header) {
> 		sf_header.headers = &io_header;
>@@ -420,8 +421,16 @@ ssize_t sys_sendfile(int tofd, int fromfd,
> 		sf_header.trl_cnt = 0;
> 	}
> 
>-	while (count != 0) {
>+	/*
>+	 * It is expected that sys_sendfile sends count or fails completely.
>+	 * To do this we ensure the socket is in blocking mode.
>+	 */
>+	old_flags = fcntl(tofd, F_GETFL, 0);
>+	if (set_blocking(tofd, true) == -1) {
>+		return -1;
>+	}
> 
>+	while (count != 0) {
> 		nwritten = count;
> #if defined(DARWIN_SENDFILE_API)
> 		/* Darwin recycles nwritten as a value-result parameter, apart from that this
>@@ -430,26 +439,9 @@ ssize_t sys_sendfile(int tofd, int fromfd,
> #else
> 		ret = sendfile(fromfd, tofd, offset, count, &sf_header, &nwritten, 0);
> #endif
>+
> 		if (ret == -1 && errno != EINTR) {
>-			if (errno == EAGAIN || errno == EWOULDBLOCK) {
>-				/*
>-				 * Sendfile must complete before we can
>-				 * send any other outgoing data on the socket.
>-				 * Ensure socket is in blocking mode.
>-				 * For SMB2 by default the socket is in
>-				 * non-blocking mode.
>-				 */
>-				old_flags = fcntl(tofd, F_GETFL, 0);
>-				ret = set_blocking(tofd, true);
>-				if (ret == -1) {
>-					goto out;
>-				}
>-				socket_flags_changed = true;
>-				continue;
>-			}
>-			/* Send failed, we are toast. */
>-			ret = -1;
>-			goto out;
>+			break;
> 		}
> 
> 		if (nwritten == 0) {
>@@ -457,6 +449,8 @@ ssize_t sys_sendfile(int tofd, int fromfd,
> 			break;
> 		}
> 
>+		twritten += nwritten;
>+
> 		if (sf_header.hdr_cnt) {
> 			if (io_header.iov_len <= nwritten) {
> 				/* Entire header was sent. */
>@@ -474,27 +468,11 @@ ssize_t sys_sendfile(int tofd, int fromfd,
> 
> 		offset += nwritten;
> 		count -= nwritten;
>+		ret = twritten;
> 	}
> 
>-	ret = nwritten;
>-
>-  out:
>-
>-	if (socket_flags_changed) {
>-		int saved_errno;
>-		int err;
>-
>-		if (ret == -1) {
>-			saved_errno = errno;
>-		}
>-		/* Restore the old state of the socket. */
>-		err = fcntl(tofd, F_SETFL, old_flags);
>-		if (err == -1) {
>-			return -1;
>-		}
>-		if (ret == -1) {
>-			errno = saved_errno;
>-		}
>+	if (fcntl(tofd, F_SETFL, old_flags) == -1) {
>+		return -1;
> 	}
> 
> 	return ret;

Flags:

metze: review-

Actions: View

Attachments on bug 14095: 15400