From owner-svn-src-stable@FreeBSD.ORG  Mon Jun 11 17:54:41 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 359801065687;
	Mon, 11 Jun 2012 17:54:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FD4A8FC0A;
	Mon, 11 Jun 2012 17:54:41 +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 q5BHseKI000983;
	Mon, 11 Jun 2012 17:54:40 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BHseTd000979;
	Mon, 11 Jun 2012 17:54:40 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201206111754.q5BHseTd000979@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 11 Jun 2012 17:54:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236900 - stable/9/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 17:54:41 -0000

Author: mjg
Date: Mon Jun 11 17:54:40 2012
New Revision: 236900
URL: http://svn.freebsd.org/changeset/base/236900

Log:
  MFC r236738:
  	Plug socket refcount leak on error in sys_sctp_peeloff.

Modified:
  stable/9/sys/kern/uipc_syscalls.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/uipc_syscalls.c
==============================================================================
--- stable/9/sys/kern/uipc_syscalls.c	Mon Jun 11 17:42:39 2012	(r236899)
+++ stable/9/sys/kern/uipc_syscalls.c	Mon Jun 11 17:54:40 2012	(r236900)
@@ -2323,11 +2323,11 @@ sys_sctp_peeloff(td, uap)
 		goto done2;
 	if (head->so_proto->pr_protocol != IPPROTO_SCTP) {
 		error = EOPNOTSUPP;
-		goto done2;
+		goto done;
 	}
 	error = sctp_can_peel_off(head, (sctp_assoc_t)uap->name);
 	if (error)
-		goto done2;
+		goto done;
 	/*
 	 * At this point we know we do have a assoc to pull
 	 * we proceed to get the fd setup. This may block