From nobody@FreeBSD.org  Tue Apr 16 18:54:36 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id B87404BA
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 16 Apr 2013 18:54:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id AA427F61
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 16 Apr 2013 18:54:36 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r3GIsaY2095953
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 16 Apr 2013 18:54:36 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r3GIsaAO095952;
	Tue, 16 Apr 2013 18:54:36 GMT
	(envelope-from nobody)
Message-Id: <201304161854.r3GIsaAO095952@red.freebsd.org>
Date: Tue, 16 Apr 2013 18:54:36 GMT
From: Sven-Thorsten Dietrich <sven@vyatta.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Missing mutex unlock - deadlock multicast subsystem
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177888
>Category:       kern
>Synopsis:       [netinet] [patch] Missing mutex unlock - deadlock multicast subsystem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 16 19:00:00 UTC 2013
>Closed-Date:    Tue Mar 18 20:02:16 UTC 2014
>Last-Modified:  Tue Mar 18 20:10:03 UTC 2014
>Originator:     Sven-Thorsten Dietrich
>Release:        head / 9.1.0
>Organization:
Vyatta
>Environment:
N/A
>Description:
return inside locked critical section
>How-To-Repeat:
see patch, run set_api_config() appropriately
>Fix:
apply patch

Patch attached with submission follows:

Index: netinet/ip_mroute.c
===================================================================
--- netinet/ip_mroute.c	(revision 249557)
+++ netinet/ip_mroute.c	(working copy)
@@ -825,6 +825,7 @@
     for (i = 0; i < mfchashsize; i++) {
 	if (LIST_FIRST(&V_mfchashtbl[i]) != NULL) {
 	    *apival = 0;
+            MFC_UNLOCK();
 	    return EPERM;
 	}
     }


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-net 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Apr 16 19:06:55 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177888 
State-Changed-From-To: open->patched 
State-Changed-By: delphij 
State-Changed-When: Tue Apr 16 19:25:53 UTC 2013 
State-Changed-Why:  
Patch applied against -HEAD, MFC reminder. 

(Note that the patch committed have moved MFC_UNLOCK to before 
set of apival as this do not need to be protected by the lock). 


Responsible-Changed-From-To: freebsd-net->delphij 
Responsible-Changed-By: delphij 
Responsible-Changed-When: Tue Apr 16 19:25:53 UTC 2013 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177888 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/177888: commit references a PR
Date: Tue, 16 Apr 2013 19:25:49 +0000 (UTC)

 Author: delphij
 Date: Tue Apr 16 19:25:41 2013
 New Revision: 249559
 URL: http://svnweb.freebsd.org/changeset/base/249559
 
 Log:
   Don't leak lock when returning.
   
   PR:		kern/177888
   Submitted by:	Sven-Thorsten Dietrich <sven vyatta com>
   MFC after:	1 week
 
 Modified:
   head/sys/netinet/ip_mroute.c
 
 Modified: head/sys/netinet/ip_mroute.c
 ==============================================================================
 --- head/sys/netinet/ip_mroute.c	Tue Apr 16 19:19:14 2013	(r249558)
 +++ head/sys/netinet/ip_mroute.c	Tue Apr 16 19:25:41 2013	(r249559)
 @@ -824,6 +824,7 @@ set_api_config(uint32_t *apival)
  
      for (i = 0; i < mfchashsize; i++) {
  	if (LIST_FIRST(&V_mfchashtbl[i]) != NULL) {
 +	    MFC_UNLOCK();
  	    *apival = 0;
  	    return EPERM;
  	}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: delphij 
State-Changed-When: Tue Mar 18 20:01:57 UTC 2014 
State-Changed-Why:  
Patch merged to stable/8 and stable/9. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177888 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/177888: commit references a PR
Date: Tue, 18 Mar 2014 20:01:50 +0000 (UTC)

 Author: delphij
 Date: Tue Mar 18 20:01:46 2014
 New Revision: 263315
 URL: http://svnweb.freebsd.org/changeset/base/263315
 
 Log:
   MFC r249559:
   
   Don't leak lock when returning.
   
   PR:	 kern/177888
   Submitted by:	Sven-Thorsten Dietrich <sven vyatta com>
 
 Modified:
   stable/8/sys/netinet/ip_mroute.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/netinet/   (props changed)
 
 Modified: stable/8/sys/netinet/ip_mroute.c
 ==============================================================================
 --- stable/8/sys/netinet/ip_mroute.c	Tue Mar 18 20:01:00 2014	(r263314)
 +++ stable/8/sys/netinet/ip_mroute.c	Tue Mar 18 20:01:46 2014	(r263315)
 @@ -820,6 +820,7 @@ set_api_config(uint32_t *apival)
  
      for (i = 0; i < mfchashsize; i++) {
  	if (LIST_FIRST(&V_mfchashtbl[i]) != NULL) {
 +	    MFC_UNLOCK();
  	    *apival = 0;
  	    return EPERM;
  	}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/177888: commit references a PR
Date: Tue, 18 Mar 2014 20:01:03 +0000 (UTC)

 Author: delphij
 Date: Tue Mar 18 20:01:00 2014
 New Revision: 263314
 URL: http://svnweb.freebsd.org/changeset/base/263314
 
 Log:
   MFC r249559:
   
   Don't leak lock when returning.
   
   PR:	 kern/177888
   Submitted by:	Sven-Thorsten Dietrich <sven vyatta com>
 
 Modified:
   stable/9/sys/netinet/ip_mroute.c
 Directory Properties:
   stable/9/sys/   (props changed)
 
 Modified: stable/9/sys/netinet/ip_mroute.c
 ==============================================================================
 --- stable/9/sys/netinet/ip_mroute.c	Tue Mar 18 19:35:26 2014	(r263313)
 +++ stable/9/sys/netinet/ip_mroute.c	Tue Mar 18 20:01:00 2014	(r263314)
 @@ -818,6 +818,7 @@ set_api_config(uint32_t *apival)
  
      for (i = 0; i < mfchashsize; i++) {
  	if (LIST_FIRST(&V_mfchashtbl[i]) != NULL) {
 +	    MFC_UNLOCK();
  	    *apival = 0;
  	    return EPERM;
  	}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
