From owner-cvs-all@FreeBSD.ORG Tue Nov 27 12:22:19 2007 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C02416A421; Tue, 27 Nov 2007 12:22:19 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 65C4213C458; Tue, 27 Nov 2007 12:22:17 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lARCMHKV040645; Tue, 27 Nov 2007 12:22:17 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lARCMHhO040644; Tue, 27 Nov 2007 12:22:17 GMT (envelope-from rwatson) Message-Id: <200711271222.lARCMHhO040644@repoman.freebsd.org> From: Robert Watson Date: Tue, 27 Nov 2007 12:22:17 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/netinet tcp_subr.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2007 12:22:19 -0000 rwatson 2007-11-27 12:22:17 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/netinet tcp_subr.c Log: Merge tcp_subr.c:1.302 from HEAD to RELENG_7: More carefully handle various cases in sysctl_drop(), such as unlocking the inpcb when there's an inpcb without associated timewait state, and not unlocking when the inpcb has been freed. This avoids a kernel panic when tcpdrop(8) is run on a socket in the TIMEWAIT state. Reported by: Rako Approved by: re (kensmith) Revision Changes Path 1.300.2.1 +7 -3 src/sys/netinet/tcp_subr.c