From owner-p4-projects@FreeBSD.ORG  Fri Nov  3 16:53:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 18F3816A4B3; Fri,  3 Nov 2006 16:53:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BE0F416A407
	for <perforce@freebsd.org>; Fri,  3 Nov 2006 16:53:43 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 90A9343D46
	for <perforce@freebsd.org>; Fri,  3 Nov 2006 16:53:43 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA3Grhlg035955
	for <perforce@freebsd.org>; Fri, 3 Nov 2006 16:53:43 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA3GrhHF035922
	for perforce@freebsd.org; Fri, 3 Nov 2006 16:53:43 GMT
	(envelope-from piso@freebsd.org)
Date: Fri, 3 Nov 2006 16:53:43 GMT
Message-Id: <200611031653.kA3GrhHF035922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109130 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Nov 2006 16:53:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=109130

Change 109130 by piso@piso_newluxor on 2006/11/03 16:52:54

	Close a small race: use a stack variable instead of returning
	a reference to a field inside the libalias struct (that is 
	no more protected by the lock).  

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#15 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#15 (text+ko) ====

@@ -2613,15 +2613,14 @@
 				 * do a probe for flag values) */
 )
 {
+	int res = -1;
 
 	LIBALIAS_LOCK(la);
 /* Enable logging? */
 	if (flags & mask & PKT_ALIAS_LOG) {
 		/* Do the enable */
-		if (InitPacketAliasLog(la) == ENOMEM) {
-			LIBALIAS_UNLOCK(la);
-			return (-1);
-		}
+		if (InitPacketAliasLog(la) == ENOMEM)
+			goto getout;
 	} else
 /* _Disable_ logging? */
 	if (~flags & mask & PKT_ALIAS_LOG) {
@@ -2640,8 +2639,10 @@
 
 /* Other flags can be set/cleared without special action */
 	la->packetAliasMode = (flags & mask) | (la->packetAliasMode & ~mask);
+	res = la->packetAliasMode;
+getout:
 	LIBALIAS_UNLOCK(la);
-	return (la->packetAliasMode);
+	return (res);
 }