From owner-svn-src-vendor@freebsd.org  Tue Aug  8 10:55:43 2017
Return-Path: <owner-svn-src-vendor@freebsd.org>
Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2C3FDD34DC;
 Tue,  8 Aug 2017 10:55:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BD3257F484;
 Tue,  8 Aug 2017 10:55:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v78Atgnr034781;
 Tue, 8 Aug 2017 10:55:42 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v78AtgCF034780;
 Tue, 8 Aug 2017 10:55:42 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201708081055.v78AtgCF034780@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 8 Aug 2017 10:55:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r322231 - vendor/illumos/dist/lib/libzfs/common
X-SVN-Group: vendor
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: vendor/illumos/dist/lib/libzfs/common
X-SVN-Commit-Revision: 322231
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-vendor>, 
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Aug 2017 10:55:44 -0000

Author: avg
Date: Tue Aug  8 10:55:42 2017
New Revision: 322231
URL: https://svnweb.freebsd.org/changeset/base/322231

Log:
  8430 dir_is_empty_readdir() doesn't properly handle error from fdopendir()
  
  illumos/illumos-gate@ba6e7e6505150388de6dc6a88741164118a421bf
  https://github.com/illumos/illumos-gate/commit/ba6e7e6505150388de6dc6a88741164118a421bf
  
  https://www.illumos.org/issues/8430
    we should close dirfd if fdopendir() fails.
  
  Reviewed by: Serapheim Dimitropoulos <serapheim@delphix.com>
  Reviewed by: Matthew Ahrens <mahrens@delphix.com>
  Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
  Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
  Reviewed by: Igor Kozhukhov <igor@dilos.org>
  Approved by: Robert Mustacchi <rm@joyent.com>
  Author: Sowrabha Gopal <sowrabha.gopal@delphix.com>

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_mount.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_mount.c	Tue Aug  8 10:52:01 2017	(r322230)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_mount.c	Tue Aug  8 10:55:42 2017	(r322231)
@@ -209,6 +209,7 @@ dir_is_empty_readdir(const char *dirname)
 	}
 
 	if ((dirp = fdopendir(dirfd)) == NULL) {
+		(void) close(dirfd);
 		return (B_TRUE);
 	}