From owner-svn-src-all@FreeBSD.ORG Thu Oct 20 17:09:54 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 051E41065676;
Thu, 20 Oct 2011 17:09:54 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id E7FE68FC14;
Thu, 20 Oct 2011 17:09:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9KH9reb083752;
Thu, 20 Oct 2011 17:09:53 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9KH9rJS083750;
Thu, 20 Oct 2011 17:09:53 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201110201709.p9KH9rJS083750@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Thu, 20 Oct 2011 17:09:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r226574 - stable/9/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Oct 2011 17:09:54 -0000
Author: np
Date: Thu Oct 20 17:09:53 2011
New Revision: 226574
URL: http://svn.freebsd.org/changeset/base/226574
Log:
MFC r226318:
Make sure the inp wasn't dropped when rexmt let go of the inp and
pcbinfo locks.
Approved by: re (kib)
Modified:
stable/9/sys/netinet/tcp_timer.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/tcp_timer.c
==============================================================================
--- stable/9/sys/netinet/tcp_timer.c Thu Oct 20 16:08:11 2011 (r226573)
+++ stable/9/sys/netinet/tcp_timer.c Thu Oct 20 17:09:53 2011 (r226574)
@@ -495,6 +495,13 @@ tcp_timer_rexmt(void * xtp)
CURVNET_RESTORE();
return;
}
+ if (inp->inp_flags & INP_DROPPED) {
+ INP_WUNLOCK(inp);
+ INP_INFO_WUNLOCK(&V_tcbinfo);
+ CURVNET_RESTORE();
+ return;
+ }
+
tp = tcp_drop(tp, tp->t_softerror ?
tp->t_softerror : ETIMEDOUT);
headlocked = 1;