From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 23 00:42:56 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 6B9D5D0F;
Thu, 23 Jan 2014 00:42:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 56F0F16C9;
Thu, 23 Jan 2014 00:42:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0N0guRO050591;
Thu, 23 Jan 2014 00:42:56 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0N0guta050590;
Thu, 23 Jan 2014 00:42:56 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201401230042.s0N0guta050590@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 23 Jan 2014 00:42:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r261062 - stable/9/sys/rpc
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jan 2014 00:42:56 -0000
Author: mav
Date: Thu Jan 23 00:42:55 2014
New Revision: 261062
URL: http://svnweb.freebsd.org/changeset/base/261062
Log:
MFC r259828:
Fix a bug introduced at r259632, triggering infinite loop in some cases.
Modified:
stable/9/sys/rpc/svc_vc.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/sys/rpc/svc_vc.c
==============================================================================
--- stable/9/sys/rpc/svc_vc.c Thu Jan 23 00:42:08 2014 (r261061)
+++ stable/9/sys/rpc/svc_vc.c Thu Jan 23 00:42:55 2014 (r261062)
@@ -555,7 +555,7 @@ svc_vc_backchannel_stat(SVCXPRT *xprt)
* leaving the result in cd->mreq. If we don't have a complete record, leave
* the partial result in cd->mreq and try to read more from the socket.
*/
-static void
+static int
svc_vc_process_pending(SVCXPRT *xprt)
{
struct cf_conn *cd = (struct cf_conn *) xprt->xp_p1;
@@ -584,7 +584,7 @@ svc_vc_process_pending(SVCXPRT *xprt)
}
if (n < sizeof(uint32_t)) {
so->so_rcv.sb_lowat = sizeof(uint32_t) - n;
- return;
+ return (FALSE);
}
m_copydata(cd->mpending, 0, sizeof(header),
(char *)&header);
@@ -620,6 +620,7 @@ svc_vc_process_pending(SVCXPRT *xprt)
}
so->so_rcv.sb_lowat = imax(1, imin(cd->resid, so->so_rcv.sb_hiwat / 2));
+ return (TRUE);
}
static bool_t
@@ -642,8 +643,10 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
for (;;) {
/* If we have no request ready, check pending queue. */
while (cd->mpending &&
- (cd->mreq == NULL || cd->resid != 0 || !cd->eor))
- svc_vc_process_pending(xprt);
+ (cd->mreq == NULL || cd->resid != 0 || !cd->eor)) {
+ if (!svc_vc_process_pending(xprt))
+ break;
+ }
/* Process and return complete request in cd->mreq. */
if (cd->mreq != NULL && cd->resid == 0 && cd->eor) {