From f404b186180d0a52875d366cca99b55e602f6d2f Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Wed, 15 Nov 2017 16:45:17 +0000 Subject: libfuzzer: Fix file listing on some filesystems Summary: For some filesystems, readdir will not populate dirent::d_type with valuable information. This causes libfuzzer to proceed with an empty corpus, instead of the file it contains. This has been tested on a server using XFS. It should fix https://bugs.llvm.org//show_bug.cgi?id=25991 Reviewers: kcc Reviewed By: kcc Differential Revision: https://reviews.llvm.org/D40028 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@318303 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/fuzzer/FuzzerIOPosix.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/fuzzer/FuzzerIOPosix.cpp b/lib/fuzzer/FuzzerIOPosix.cpp index 2c452a7dd..9d2f6119e 100644 --- a/lib/fuzzer/FuzzerIOPosix.cpp +++ b/lib/fuzzer/FuzzerIOPosix.cpp @@ -32,6 +32,13 @@ bool IsFile(const std::string &Path) { return S_ISREG(St.st_mode); } +static bool IsDirectory(const std::string &Path) { + struct stat St; + if (stat(Path.c_str(), &St)) + return false; + return S_ISDIR(St.st_mode); +} + size_t FileSize(const std::string &Path) { struct stat St; if (stat(Path.c_str(), &St)) @@ -52,9 +59,12 @@ void ListFilesInDirRecursive(const std::string &Dir, long *Epoch, } while (auto E = readdir(D)) { std::string Path = DirPlusFile(Dir, E->d_name); - if (E->d_type == DT_REG || E->d_type == DT_LNK) + if (E->d_type == DT_REG || E->d_type == DT_LNK || + (E->d_type == DT_UNKNOWN && IsFile(Path))) V->push_back(Path); - else if (E->d_type == DT_DIR && *E->d_name != '.') + else if ((E->d_type == DT_DIR || + (E->d_type == DT_UNKNOWN && IsDirectory(Path))) && + *E->d_name != '.') ListFilesInDirRecursive(Path, Epoch, V, false); } closedir(D); -- cgit v1.2.3