From owner-svn-src-stable-7@FreeBSD.ORG  Sun Apr 24 22:12:01 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DA9E106564A;
	Sun, 24 Apr 2011 22:12:01 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E14E8FC12;
	Sun, 24 Apr 2011 22:12:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3OMC1IK049167;
	Sun, 24 Apr 2011 22:12:01 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3OMC0AK049165;
	Sun, 24 Apr 2011 22:12:00 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201104242212.p3OMC0AK049165@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 24 Apr 2011 22:12:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221000 - stable/7/lib/libc/rpc
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Apr 2011 22:12:01 -0000

Author: rmacklem
Date: Sun Apr 24 22:12:00 2011
New Revision: 221000
URL: http://svn.freebsd.org/changeset/base/221000

Log:
  MFC: r220519
  Fix a bug in the userland rpc library, where it would use a
  negative return value from write to update its position in
  a buffer. The patch, courtesy of Andrey Simonenko, also simplifies
  a conditional by removing the "i != cnt" clause, since it is
  always true at this point in the code. The bug caused problems
  for mountd, when it generated a large reply to an exports RPC
  request.

Modified:
  stable/7/lib/libc/rpc/svc_vc.c
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/lib/libc/rpc/svc_vc.c
==============================================================================
--- stable/7/lib/libc/rpc/svc_vc.c	Sun Apr 24 21:27:29 2011	(r220999)
+++ stable/7/lib/libc/rpc/svc_vc.c	Sun Apr 24 22:12:00 2011	(r221000)
@@ -550,7 +550,7 @@ write_vc(xprtp, buf, len)
 				cd->strm_stat = XPRT_DIED;
 				return (-1);
 			}
-			if (cd->nonblock && i != cnt) {
+			if (cd->nonblock) {
 				/*
 				 * For non-blocking connections, do not
 				 * take more than 2 seconds writing the
@@ -564,6 +564,7 @@ write_vc(xprtp, buf, len)
 					return (-1);
 				}
 			}
+			i = 0;
 		}
 	}