From owner-svn-src-all@FreeBSD.ORG  Sun Aug 19 11:54:03 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10FFC106564A;
	Sun, 19 Aug 2012 11:54:03 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EFC008FC08;
	Sun, 19 Aug 2012 11:54:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7JBs2dA078817;
	Sun, 19 Aug 2012 11:54:02 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7JBs2hc078815;
	Sun, 19 Aug 2012 11:54:02 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <201208191154.q7JBs2hc078815@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Sun, 19 Aug 2012 11:54:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239395 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Aug 2012 11:54:03 -0000

Author: rrs
Date: Sun Aug 19 11:54:02 2012
New Revision: 239395
URL: http://svn.freebsd.org/changeset/base/239395

Log:
  Though I disagree, I conceed to jhb & Rui. Note
  that we still have a problem with this whole structure of
  locks and in_input.c [it does not lock which it should not, but
  this *can* lead to crashes]. (I have seen it in our SQA
  testbed.. besides the one with a refcnt issue that I will
  have SQA work on next week ;-)

Modified:
  head/sys/netinet/in.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Sun Aug 19 10:34:40 2012	(r239394)
+++ head/sys/netinet/in.c	Sun Aug 19 11:54:02 2012	(r239395)
@@ -573,6 +573,7 @@ in_control(struct socket *so, u_long cmd
 	}
 	TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
 	IF_ADDR_WUNLOCK(ifp);
+	ifa_free(&ia->ia_ifa);		      /* if_addrhead */
 
 	IN_IFADDR_WLOCK();
 	TAILQ_REMOVE(&V_in_ifaddrhead, ia, ia_link);
@@ -596,7 +597,6 @@ in_control(struct socket *so, u_long cmd
 	} else
 		ifa_free(&iap->ia_ifa);
 
-	ifa_free(&ia->ia_ifa);				/* if_addrhead */
 	ifa_free(&ia->ia_ifa);				/* in_ifaddrhead */
 out:
 	if (ia != NULL)