From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 21:11:34 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A1E916A4D0; Wed,  5 Nov 2003 21:11:34 -0800 (PST)
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 D99CB16A4CE
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 21:11:33 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 50ADC44001
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 21:11:33 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA65BXXJ091454
	for <perforce@freebsd.org>; Wed, 5 Nov 2003 21:11:33 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA65BWlN091451
	for perforce@freebsd.org; Wed, 5 Nov 2003 21:11:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Nov 2003 21:11:32 -0800 (PST)
Message-Id: <200311060511.hA65BWlN091451@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41564 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 06 Nov 2003 05:11:34 -0000

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

Change 41564 by sam@sam_ebb on 2003/11/05 21:10:48

	must _always_ grab Giant to protect sbappendaddr

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_mroute.c#20 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_mroute.c#20 (text+ko) ====

@@ -1289,13 +1289,13 @@
 socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src)
 {
     if (s) {
-	NET_PICKUP_GIANT();
+	mtx_lock(&Giant);		/* XXX until sockets are locked */
 	if (sbappendaddr(&s->so_rcv, (struct sockaddr *)src, mm, NULL) != 0) {
 	    sorwakeup(s);
-	    NET_DROP_GIANT();
+	    mtx_unlock(&Giant);
 	    return 0;
 	}
-	NET_DROP_GIANT();
+	mtx_unlock(&Giant);
     }
     m_freem(mm);
     return -1;