From owner-svn-src-releng@FreeBSD.ORG  Mon Dec 23 01:15:55 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3BE784D;
 Mon, 23 Dec 2013 01:15:55 +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 8F9981820;
 Mon, 23 Dec 2013 01:15:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBN1FtGZ020015;
 Mon, 23 Dec 2013 01:15:55 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBN1FtJF020014;
 Mon, 23 Dec 2013 01:15:55 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201312230115.rBN1FtJF020014@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 23 Dec 2013 01:15:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r259757 - releng/10.0/sys/netgraph
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Dec 2013 01:15:55 -0000

Author: glebius
Date: Mon Dec 23 01:15:55 2013
New Revision: 259757
URL: http://svnweb.freebsd.org/changeset/base/259757

Log:
  Revert one line from r248885, which uncovered several bugs in processing
  interaction between ksocket_incoming2() and soreceive().
  
  This is direct commit to releng/10.0. A conservative solution for releng
  branch. Proper fix in head is r259681.
  
  PR:		184601
  Sponsored by:	Nginx, Inc.
  Approved by:	re (gjb)

Modified:
  releng/10.0/sys/netgraph/ng_ksocket.c

Modified: releng/10.0/sys/netgraph/ng_ksocket.c
==============================================================================
--- releng/10.0/sys/netgraph/ng_ksocket.c	Mon Dec 23 00:02:18 2013	(r259756)
+++ releng/10.0/sys/netgraph/ng_ksocket.c	Mon Dec 23 01:15:55 2013	(r259757)
@@ -1095,7 +1095,7 @@ ng_ksocket_incoming2(node_p node, hook_p
 
 	/* Read and forward available mbuf's */
 	auio.uio_td = NULL;
-	auio.uio_resid = MJUMPAGESIZE;	/* XXXGL: sane limit? */
+	auio.uio_resid = 1000000000;
 	flags = MSG_DONTWAIT;
 	while (1) {
 		struct sockaddr *sa = NULL;