From owner-svn-src-all@FreeBSD.ORG  Sat Aug 14 14:13:44 2010
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 EAA7A1065698;
	Sat, 14 Aug 2010 14:13:44 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DAA338FC08;
	Sat, 14 Aug 2010 14:13:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7EEDiND029753;
	Sat, 14 Aug 2010 14:13:44 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7EEDiBZ029751;
	Sat, 14 Aug 2010 14:13:44 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201008141413.o7EEDiBZ029751@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 14 Aug 2010 14:13:44 +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: r211301 - head/sys/netinet6
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: Sat, 14 Aug 2010 14:13:45 -0000

Author: bz
Date: Sat Aug 14 14:13:44 2010
New Revision: 211301
URL: http://svn.freebsd.org/changeset/base/211301

Log:
  In rip6_input(), in case of multicast, we might skip the normal processing
  and go to the next iteration early if multicast filtering would decide that
  this socket shall not receive the data.
  Unlock the pcb in that case or we leak the read lock and next time trying
  to get a write lock, would hang forever.
  
  PR:		kern/149608
  Submitted by:	Chris Luke (chrisy flirble.org)
  MFC after:	3 days

Modified:
  head/sys/netinet6/raw_ip6.c

Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c	Sat Aug 14 14:09:13 2010	(r211300)
+++ head/sys/netinet6/raw_ip6.c	Sat Aug 14 14:13:44 2010	(r211301)
@@ -248,6 +248,7 @@ rip6_input(struct mbuf **mp, int *offp, 
 			}
 			if (blocked != MCAST_PASS) {
 				IP6STAT_INC(ip6s_notmember);
+				INP_RUNLOCK(in6p);
 				continue;
 			}
 		}