From owner-svn-src-head@FreeBSD.ORG  Sun Apr 10 14:11:08 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5757D106566C;
	Sun, 10 Apr 2011 14:11:08 +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 45CBE8FC16;
	Sun, 10 Apr 2011 14:11:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3AEB8lE050465;
	Sun, 10 Apr 2011 14:11:08 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3AEB8jV050463;
	Sun, 10 Apr 2011 14:11:08 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201104101411.p3AEB8jV050463@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 10 Apr 2011 14:11:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220519 - head/lib/libc/rpc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Apr 2011 14:11:08 -0000

Author: rmacklem
Date: Sun Apr 10 14:11:07 2011
New Revision: 220519
URL: http://svn.freebsd.org/changeset/base/220519

Log:
  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.
  
  Submitted by:	simon at comsys.ntu-kpi.kiev.ua
  MFC after:	2 weeks

Modified:
  head/lib/libc/rpc/svc_vc.c

Modified: head/lib/libc/rpc/svc_vc.c
==============================================================================
--- head/lib/libc/rpc/svc_vc.c	Sun Apr 10 13:45:46 2011	(r220518)
+++ head/lib/libc/rpc/svc_vc.c	Sun Apr 10 14:11:07 2011	(r220519)
@@ -546,7 +546,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
@@ -560,6 +560,7 @@ write_vc(xprtp, buf, len)
 					return (-1);
 				}
 			}
+			i = 0;
 		}
 	}