svn commit: r259757 - releng/10.0/sys/netgraph

Gleb Smirnoff glebius at FreeBSD.org
Mon Dec 23 01:15:55 UTC 2013


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;


More information about the svn-src-all mailing list