Attachment 7217 Details for Bug 8679 – git am fix for 3.6.x and 3.5.x.

[patch] git am fix for 3.6.x and 3.5.x.

0001-Fix-bug-8679-recvfile-code-path-using-splice-on-Linu.patch (text/plain), 988 bytes, created by Jeremy Allison on 2011-12-31 02:01:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-12-31 02:01:00 UTC

Size: 988 bytes

patch

obsolete

>From eb617374a673bb1189dd9b6bccbf3f1d9fb91010 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Sat, 24 Dec 2011 21:12:09 -0800
>Subject: [PATCH] Fix bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write
>
>Bug found and fix suggested by Andrew Bartlett.
>
>Autobuild-User: Jeremy Allison <jra@samba.org>
>Autobuild-Date: Sun Dec 25 07:46:38 CET 2011 on sn-devel-104
>---
> source3/lib/recvfile.c |    5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/source3/lib/recvfile.c b/source3/lib/recvfile.c
>index 7cbb8a0..5d1c0b2 100644
>--- a/source3/lib/recvfile.c
>+++ b/source3/lib/recvfile.c
>@@ -214,10 +214,9 @@ ssize_t sys_recvfile(int fromfd,
> 	}
> 
>  done:
>-	if (total_written < count) {
>+	if (count) {
> 		int saved_errno = errno;
>-		if (drain_socket(fromfd, count-total_written) !=
>-				count-total_written) {
>+		if (drain_socket(fromfd, count) != count) {
> 			/* socket is dead. */
> 			return -1;
> 		}
>-- 
>1.7.0.4
>

Actions: View

Attachments on bug 8679: 7217 | 7223