Author: mav Date: Thu Mar 22 23:56:53 2018 New Revision: 331398 URL: https://svnweb.freebsd.org/changeset/base/331398
Log: MFC r329691: MFV r322231: 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 <seraph...@delphix.com> Reviewed by: Matthew Ahrens <mahr...@delphix.com> Reviewed by: Dan Kimmel <dan.kim...@delphix.com> Reviewed by: Yuri Pankov <yuri.pan...@nexenta.com> Reviewed by: Igor Kozhukhov <i...@dilos.org> Approved by: Robert Mustacchi <r...@joyent.com> Author: Sowrabha Gopal <sowrabha.go...@delphix.com> Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Thu Mar 22 23:56:17 2018 (r331397) +++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Thu Mar 22 23:56:53 2018 (r331398) @@ -216,6 +216,7 @@ dir_is_empty_readdir(const char *dirname) } if ((dirp = fdopendir(dirfd)) == NULL) { + (void) close(dirfd); return (B_TRUE); } _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"