From owner-freebsd-current@FreeBSD.ORG Sun Aug 2 19:29:13 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50A33106575B for ; Sun, 2 Aug 2009 19:29:13 +0000 (UTC) (envelope-from cattelan@thebarn.com) Received: from slurp.thebarn.com (unknown [IPv6:2002:d02a:75ca:1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 8DDFC8FC18 for ; Sun, 2 Aug 2009 19:29:10 +0000 (UTC) (envelope-from cattelan@thebarn.com) Received: from funky.x.thebarn.com (slurp.x.thebarn.com [10.0.0.11]) (authenticated bits=0) by slurp.thebarn.com (8.14.3/8.14.0) with ESMTP id n6VGofvp031997 for ; Fri, 31 Jul 2009 11:50:57 -0500 (CDT) (envelope-from cattelan@thebarn.com) Message-ID: <4A7320E1.4050308@thebarn.com> Date: Fri, 31 Jul 2009 11:50:41 -0500 From: Russell Cattelan User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728) MIME-Version: 1.0 To: FreeBSD Current X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: small fix to netatalk X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2009 19:29:13 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 starting up netatalk would panic the system with a lock not locked panic. It appears somebody reversed the 2 lock statements in netatalk/at_control.c diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c index 5193d66..b2d8422 100644 - --- a/sys/netatalk/at_control.c +++ b/sys/netatalk/at_control.c @@ -276,7 +276,7 @@ at_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, * If the request is specifying phase 1, then * only look at a phase one address */ - - AT_IFADDR_RUNLOCK(); + AT_IFADDR_RLOCK(); for (oaa = aa; aa; aa = TAILQ_NEXT(aa, aa_link)) { if (aa->aa_ifp == ifp && (aa->aa_flags & AFA_PHASE2) == 0) @@ -286,7 +286,7 @@ at_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, ifa_free(&oaa->aa_ifa); if (aa != NULL && oaa != aa) ifa_ref(&aa->aa_ifa); - - AT_IFADDR_RLOCK(); + AT_IFADDR_RUNLOCK(); } else { struct at_ifaddr *oaa; -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFKcyDhNRmM+OaGhBgRAnDKAJ0Ys2GMVJphbq6Qdgq6cvj85iKShwCfQsAE P95+NxdFPwEjB/r0yQbTris= =K0G2 -----END PGP SIGNATURE-----