From owner-trustedbsd-cvs@FreeBSD.ORG Mon Sep 8 04:52:54 2014 Return-Path: Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 371E415EC for ; Mon, 8 Sep 2014 04:52:54 +0000 (UTC) Received: from cyrus.watson.org (cyrus.watson.org [198.74.231.69]) by mx1.freebsd.org (Postfix) with ESMTP id F38F01180 for ; Mon, 8 Sep 2014 04:52:53 +0000 (UTC) Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116]) by cyrus.watson.org (Postfix) with ESMTPS id 3EEBB46B89 for ; Mon, 8 Sep 2014 00:52:47 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:1900:2254:206c::16:88]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx2.freebsd.org (Postfix) with ESMTPS id 94F3746BC; Mon, 8 Sep 2014 04:52:42 +0000 (UTC) Received: by hub.freebsd.org (Postfix, from userid 32767) id 182E7C07; Mon, 8 Sep 2014 04:52:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D72165A0 for ; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 912321E6A for ; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p4Ns026785 for ; Mon, 8 Sep 2014 04:51:04 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p4Up026782 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:04 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 8 Sep 2014 04:51:04 GMT Message-Id: <201409080451.s884p4Up026782@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer Subject: PERFORCE change 1199465 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.18-1 List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:54 -0000 http://p4web.freebsd.org/@@1199465?ac=10 Change 1199465 by brueffer@brueffer_freefall on 2014/08/28 12:05:26 Unlock the right lock. The adist_remote_lock is not held in this place, whereas the adist_recv_list_lock lock is and is picked up during the next iteration. Submitted by: ed Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#5 $ */ #include @@ -643,7 +643,7 @@ * we can use that. */ if (TAILQ_EMPTY(&adist_recv_list)) { - rw_unlock(&adist_remote_lock); + mtx_unlock(&adist_recv_list_lock); continue; } mtx_unlock(&adist_recv_list_lock);