From owner-cvs-src@FreeBSD.ORG Mon Sep 29 19:19:31 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BC7B1065693; Mon, 29 Sep 2008 19:19:31 +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 1979E8FC17; Mon, 29 Sep 2008 19:19:31 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8TJJUII033768; Mon, 29 Sep 2008 19:19:30 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8TJJUiW033767; Mon, 29 Sep 2008 19:19:30 GMT (envelope-from rwatson@repoman.freebsd.org) Message-Id: <200809291919.m8TJJUiW033767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rwatson@repoman.freebsd.org using -f From: Robert Watson Date: Mon, 29 Sep 2008 19:19:27 +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 ip_fw2.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Sep 2008 19:19:31 -0000 rwatson 2008-09-29 19:19:27 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/netinet ip_fw2.c Log: SVN rev 183473 on 2008-09-29 19:19:27Z by rwatson Merge r183418 from head to stable/7: When an inpcb doesn't have a socket but the inpcb is passed to ipfw in the transmit path, such as TCPS_TIMEWAIT, fail the credential extraction immediately rather than acquiring locks and looking up the inpcb on the global lists in order to reach the conclusion that the credential extraction has failed. This is more efficient, but more importantly, it avoids lock recursion on the inpcbinfo, which is no longer allowed with rwlocks. This appears to have been responsible for at least two reported panics. Reported by: ganbold Approved by: re (kib) Revision Changes Path 1.175.2.12 +2 -1 src/sys/netinet/ip_fw2.c