From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 14 19:21:20 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6F4893DB;
 Fri, 14 Nov 2014 19:21:20 +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 5BE2661D;
 Fri, 14 Nov 2014 19:21:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAEJLK55005719;
 Fri, 14 Nov 2014 19:21:20 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAEJLK7W005718;
 Fri, 14 Nov 2014 19:21:20 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201411141921.sAEJLK7W005718@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 19:21:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274525 - projects/sendfile/sys/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2014 19:21:20 -0000

Author: glebius
Date: Fri Nov 14 19:21:19 2014
New Revision: 274525
URL: https://svnweb.freebsd.org/changeset/base/274525

Log:
  Now that sbcut() avoid to free M_NOTREADY mbufs, in case of socket
  going down we are responsible to free the mbufs.

Modified:
  projects/sendfile/sys/netinet/tcp_usrreq.c

Modified: projects/sendfile/sys/netinet/tcp_usrreq.c
==============================================================================
--- projects/sendfile/sys/netinet/tcp_usrreq.c	Fri Nov 14 19:08:19 2014	(r274524)
+++ projects/sendfile/sys/netinet/tcp_usrreq.c	Fri Nov 14 19:21:19 2014	(r274525)
@@ -953,6 +953,8 @@ tcp_usr_ready(struct socket *so, struct 
 	INP_WLOCK(inp);
 	if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) {
 		INP_WUNLOCK(inp);
+		for (int i = 0; i < count; i++)
+			m = m_free(m);
 		return (ECONNRESET);
 	}
 	tp = intotcpcb(inp);