From owner-svn-src-all@FreeBSD.ORG  Mon Jul  1 03:27:15 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 30257164;
 Mon,  1 Jul 2013 03:27:15 +0000 (UTC)
 (envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 21C1E1A2E;
 Mon,  1 Jul 2013 03:27:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r613RFn5045151;
 Mon, 1 Jul 2013 03:27:15 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r613REG0045150;
 Mon, 1 Jul 2013 03:27:14 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201307010327.r613REG0045150@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Mon, 1 Jul 2013 03:27:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252436 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 01 Jul 2013 03:27:15 -0000

Author: trociny
Date: Mon Jul  1 03:27:14 2013
New Revision: 252436
URL: http://svnweb.freebsd.org/changeset/base/252436

Log:
  Plug up the lock lock leakage when exporting to a short buffer.
  
  Reported by:	Alexander Leidinger
  Submitted by:	mjg
  MFC after:	1 week

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Mon Jul  1 03:00:15 2013	(r252435)
+++ head/sys/kern/kern_descrip.c	Mon Jul  1 03:27:14 2013	(r252436)
@@ -3272,6 +3272,8 @@ export_fd_to_sb(void *data, int type, in
 		if (efbuf->remainder < kif->kf_structsize) {
 			/* Terminate export. */
 			efbuf->remainder = 0;
+			if (efbuf->fdp != NULL && !locked)
+				FILEDESC_SLOCK(efbuf->fdp);
 			return (0);
 		}
 		efbuf->remainder -= kif->kf_structsize;