From owner-svn-src-head@FreeBSD.ORG  Sat Jun  4 16:26:02 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E17121065672;
	Sat,  4 Jun 2011 16:26:02 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D1EAD8FC21;
	Sat,  4 Jun 2011 16:26: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 p54GQ2Qg017531;
	Sat, 4 Jun 2011 16:26:02 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p54GQ27O017529;
	Sat, 4 Jun 2011 16:26:02 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201106041626.p54GQ27O017529@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 4 Jun 2011 16:26: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: r222690 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2011 16:26:03 -0000

Author: rwatson
Date: Sat Jun  4 16:26:02 2011
New Revision: 222690
URL: http://svn.freebsd.org/changeset/base/222690

Log:
  IP divert sockets use their inpcbinfo for port reservation, although not
  for lookup.  I missed its call to in_pcbbind() when preparing previous
  patches, which would lead to a lock assertion failure (although problem
  not an actual race condition due to global pcbinfo locks providing
  required synchronisation -- in this particular case only).  This change
  adds the missing locking of the pcbhash lock.
  
  (Existing comments in the ipdivert code question the need for using the
  global hash to manage the namespace, as really it's a simple port
  namespace and not an address/port namespace.  Also, although in_pcbbind
  is used to manage reservations, the hash tables aren't used for lookup.
  It might be a good idea to make them use hashed lookup, or to use a
  different reservation scheme.)
  
  Reviewed by:    bz
  Reported by:    Kristof Provost <kristof at sigsegv.be>
  Sponsored by:   Juniper Networks

Modified:
  head/sys/netinet/ip_divert.c

Modified: head/sys/netinet/ip_divert.c
==============================================================================
--- head/sys/netinet/ip_divert.c	Sat Jun  4 16:25:12 2011	(r222689)
+++ head/sys/netinet/ip_divert.c	Sat Jun  4 16:26:02 2011	(r222690)
@@ -530,7 +530,9 @@ div_bind(struct socket *so, struct socka
 	((struct sockaddr_in *)nam)->sin_addr.s_addr = INADDR_ANY;
 	INP_INFO_WLOCK(&V_divcbinfo);
 	INP_WLOCK(inp);
+	INP_HASH_WLOCK(&V_divcbinfo);
 	error = in_pcbbind(inp, nam, td->td_ucred);
+	INP_HASH_WUNLOCK(&V_divcbinfo);
 	INP_WUNLOCK(inp);
 	INP_INFO_WUNLOCK(&V_divcbinfo);
 	return error;