From owner-cvs-src@FreeBSD.ORG Sun Oct 16 17:12:18 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CF7916A420; Sun, 16 Oct 2005 17:12:18 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B15B43D46; Sun, 16 Oct 2005 17:12:18 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9GHCIlW079963; Sun, 16 Oct 2005 17:12:18 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9GHCI4O079962; Sun, 16 Oct 2005 17:12:18 GMT (envelope-from rwatson) Message-Id: <200510161712.j9GHCI4O079962@repoman.freebsd.org> From: Robert Watson Date: Sun, 16 Oct 2005 17:12:18 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6_0 Cc: Subject: cvs commit: src/sys/netinet in.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: Sun, 16 Oct 2005 17:12:18 -0000 rwatson 2005-10-16 17:12:18 UTC FreeBSD src repository Modified files: (Branch: RELENG_6_0) sys/netinet in.c Log: Merge in.c:1.89,1.90 from HEAD to RELENG_6_0: Acquire Giant conditionally in in_addmulti() and in_delmulti() based on whether the interface being accessed is IFF_NEEDSGIANT or not. This avoids lock order reversals when calling into the interface ioctl handler, which could potentially lead to deadlock. The long term solution is to eliminate non-MPSAFE network drivers. Discussed with: jhb Unlock Giant symmetrically with respect to lock acquire order as that's generally nicer. Spotted by: johan Approved by: re (kensmith) Revision Changes Path 1.85.2.3.2.1 +9 -0 src/sys/netinet/in.c