From owner-svn-src-head@FreeBSD.ORG  Fri Nov 14 06:02:30 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1596A2A2;
 Fri, 14 Nov 2014 06:02:30 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 02AC2230;
 Fri, 14 Nov 2014 06:02:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAE62TiY031282;
 Fri, 14 Nov 2014 06:02:29 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAE62Tdu031281;
 Fri, 14 Nov 2014 06:02:29 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201411140602.sAE62Tdu031281@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 14 Nov 2014 06:02:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274494 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Fri, 14 Nov 2014 06:02:30 -0000

Author: glebius
Date: Fri Nov 14 06:02:29 2014
New Revision: 274494
URL: https://svnweb.freebsd.org/changeset/base/274494

Log:
  There should not be zero length mbufs in socket buffers.  The code comes
  from r1451, and thus can't be explained.  A patch with explicit panic()
  here survived all tests.
  
  Tested by:	pho
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/kern/uipc_sockbuf.c

Modified: head/sys/kern/uipc_sockbuf.c
==============================================================================
--- head/sys/kern/uipc_sockbuf.c	Fri Nov 14 04:26:26 2014	(r274493)
+++ head/sys/kern/uipc_sockbuf.c	Fri Nov 14 06:02:29 2014	(r274494)
@@ -905,13 +905,6 @@ sbcut_internal(struct sockbuf *sb, int l
 		mfree = m;
 		m = n;
 	}
-	while (m && m->m_len == 0) {
-		sbfree(sb, m);
-		n = m->m_next;
-		m->m_next = mfree;
-		mfree = m;
-		m = n;
-	}
 	if (m) {
 		sb->sb_mb = m;
 		m->m_nextpkt = next;