From nobody Mon Mar 28 15:24:15 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9609B1A3045C; Mon, 28 Mar 2022 15:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRxLm2YvGz3Nsd; Mon, 28 Mar 2022 15:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648481056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMiN618sKs68YSLm/l6DthsfpDWALgmvu0SbrK2NbT0=; b=Psm00UUABhJYeJMBB9+GjhnpS3reDMlXdcVlbJmSRKM9h1UFCdbfUh3LrPaWQdcW1ECGRA gOn01Ix7YcxJ9QInXX1mlRXD0FfELRvysWR/ouSKLGyLcgqWxR1TL7zG7FLI3SJOzc9Y68 izeBQm5p639pCyyy45cUWxfH6X+tfWVNTK3H63newJaWD3vzOr4Rd5E8OcMYiiYdA9dp+o IhnSCtjbsLBddgIY+w8QlL/NYNaI2CB3dsK/IPpGQijlcDp1lJJ5Lip30J7DO2agTHsgsJ g9iY2kHEaKt8eV6z5WC9aFFgxBxFAO2AnEBK2u41SnJUYWvaermz0Kz2o6to1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C18A45C1; Mon, 28 Mar 2022 15:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SFOFlW086529; Mon, 28 Mar 2022 15:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SFOFEQ086528; Mon, 28 Mar 2022 15:24:15 GMT (envelope-from git) Date: Mon, 28 Mar 2022 15:24:15 GMT Message-Id: <202203281524.22SFOFEQ086528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0cff70ca6654 - main - libc: Check for readdir(2) errors in fts(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cff70ca66547ca5b04030ef07e6a0b9759a0184 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648481056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mMiN618sKs68YSLm/l6DthsfpDWALgmvu0SbrK2NbT0=; b=IyhMkDMAHP+MUsjgMeu2L/Vh14Xzpi1v7PpUQEx3U78CNfM4ZdC6PWt1EBuHGwaDjhbVDH cxVhJV+QxR3OxXlcfuSrKIZpxyLtuELmmg8CyMJGv6mdy4L84joWMOy84o3HV+2CQbIf7U l1eDI/xK7r91Im56EM2ov3TjTVFbKYxw9MWwaUkk/4dOZfmlGh2nmliBBl1f7NvXDF2hxv iKNctgEOBpLwo/4Vtq4q38vOfGEQDy6DYSI+sSWab8vwCNO6NA3UyDpe63siAvCURTKERA ubQ9cBXvUaQPff01Y0qIDqubl/DTrJ8k7catlHu9A/vLMT75qA6XBecq1ApWWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648481056; a=rsa-sha256; cv=none; b=Dc/hIZ/kdIABMlCdH1LP4UG8CTCyQx7FA8OvcjzIXd2o4Se5DTtewbim/j5K35J+htS87S vJ9o8QuyeZpWupPfYSq5TEjO0wgMLtdXQ32VUX1jfvLG7UgtvhrNZUkl1du9rw0jk9Hggw xJmdAb+GbxbshfU3aouMKDjiFXH1v6tLJ4xuiAI47djZgObPQvfWcrGLMk5WlJReD5koTq fTQLj36wk3KI0rg89QGJ22cH2aHavKWxw9dakX3Ts8kSYBvutYmhsfggo4Y/6n3YajB/Pn gZ6kF3dV+JzYcZh2AmA3Beqlty/LyrWLS6YHWbg4Hw7I++3BBHT7jXbsCVJSdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0cff70ca66547ca5b04030ef07e6a0b9759a0184 commit 0cff70ca66547ca5b04030ef07e6a0b9759a0184 Author: Ganael LAPLANCHE AuthorDate: 2022-03-28 14:54:02 +0000 Commit: Mark Johnston CommitDate: 2022-03-28 15:23:46 +0000 libc: Check for readdir(2) errors in fts(3) Previously, such errors were not distinguished from the end-of-directory condition. With improvements from Mahmoud Abumandour . Reviewed by: markj PR: 262038 MFC after: 2 weeks --- lib/libc/gen/fts-compat.c | 31 ++++++++++++++++++++++++++++--- lib/libc/gen/fts-compat11.c | 32 +++++++++++++++++++++++++++++--- lib/libc/gen/fts.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 87 insertions(+), 9 deletions(-) diff --git a/lib/libc/gen/fts-compat.c b/lib/libc/gen/fts-compat.c index ccdd4f15905b..9f295110f1c7 100644 --- a/lib/libc/gen/fts-compat.c +++ b/lib/libc/gen/fts-compat.c @@ -610,6 +610,19 @@ __fts_set_clientptr_44bsd(FTS *sp, void *clientptr) sp->fts_clientptr = clientptr; } +static struct freebsd11_dirent * +fts_safe_readdir(DIR *dirp, int *readdir_errno) +{ + struct freebsd11_dirent *ret; + + errno = 0; + if (!dirp) + return (NULL); + ret = freebsd11_readdir(dirp); + *readdir_errno = errno; + return (ret); +} + /* * This is the tricky part -- do not casually change *anything* in here. The * idea is to build the linked list of entries that are used by fts_children @@ -634,7 +647,7 @@ fts_build(FTS *sp, int type) DIR *dirp; void *oldaddr; int cderrno, descend, len, level, maxlen, nlinks, oflag, saved_errno, - nostat, doadjust, dnamlen; + nostat, doadjust, dnamlen, readdir_errno; char *cp; /* Set current node pointer. */ @@ -738,8 +751,9 @@ fts_build(FTS *sp, int type) /* Read the directory, attaching each entry to the `link' pointer. */ doadjust = 0; + readdir_errno = 0; for (head = tail = NULL, nitems = 0; - dirp && (dp = freebsd11_readdir(dirp));) { + (dp = fts_safe_readdir(dirp, &readdir_errno));) { dnamlen = dp->d_namlen; if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) continue; @@ -839,6 +853,16 @@ mem1: saved_errno = errno; } ++nitems; } + + if (readdir_errno) { + cur->fts_errno = readdir_errno; + /* + * If we've not read any items yet, treat + * the error as if we can't access the dir. + */ + cur->fts_info = nitems ? FTS_ERR : FTS_DNR; + } + if (dirp) (void)closedir(dirp); @@ -877,7 +901,8 @@ mem1: saved_errno = errno; /* If didn't find anything, return NULL. */ if (!nitems) { - if (type == BREAD) + if (type == BREAD && + cur->fts_info != FTS_DNR && cur->fts_info != FTS_ERR) cur->fts_info = FTS_DP; return (NULL); } diff --git a/lib/libc/gen/fts-compat11.c b/lib/libc/gen/fts-compat11.c index 288351d2008b..a18ce3f00a6a 100644 --- a/lib/libc/gen/fts-compat11.c +++ b/lib/libc/gen/fts-compat11.c @@ -607,6 +607,19 @@ freebsd11_fts_set_clientptr(FTS11 *sp, void *clientptr) sp->fts_clientptr = clientptr; } +static struct freebsd11_dirent * +fts_safe_readdir(DIR *dirp, int *readdir_errno) +{ + struct freebsd11_dirent *ret; + + errno = 0; + if (!dirp) + return (NULL); + ret = freebsd11_readdir(dirp); + *readdir_errno = errno; + return (ret); +} + /* * This is the tricky part -- do not casually change *anything* in here. The * idea is to build the linked list of entries that are used by fts_children @@ -630,7 +643,8 @@ fts_build(FTS11 *sp, int type) DIR *dirp; void *oldaddr; char *cp; - int cderrno, descend, oflag, saved_errno, nostat, doadjust; + int cderrno, descend, oflag, saved_errno, nostat, doadjust, + readdir_errno; long level; long nlinks; /* has to be signed because -1 is a magic value */ size_t dnamlen, len, maxlen, nitems; @@ -736,8 +750,9 @@ fts_build(FTS11 *sp, int type) /* Read the directory, attaching each entry to the `link' pointer. */ doadjust = 0; + readdir_errno = 0; for (head = tail = NULL, nitems = 0; - dirp && (dp = freebsd11_readdir(dirp));) { + (dp = fts_safe_readdir(dirp, &readdir_errno));) { dnamlen = dp->d_namlen; if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) continue; @@ -823,6 +838,16 @@ mem1: saved_errno = errno; } ++nitems; } + + if (readdir_errno) { + cur->fts_errno = readdir_errno; + /* + * If we've not read any items yet, treat + * the error as if we can't access the dir. + */ + cur->fts_info = nitems ? FTS_ERR : FTS_DNR; + } + if (dirp) (void)closedir(dirp); @@ -859,7 +884,8 @@ mem1: saved_errno = errno; /* If didn't find anything, return NULL. */ if (!nitems) { - if (type == BREAD) + if (type == BREAD && + cur->fts_info != FTS_DNR && cur->fts_info != FTS_ERR) cur->fts_info = FTS_DP; return (NULL); } diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index d0705e123775..5186ae047a3b 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -604,6 +604,19 @@ fts_set_clientptr(FTS *sp, void *clientptr) sp->fts_clientptr = clientptr; } +static struct dirent * +fts_safe_readdir(DIR *dirp, int *readdir_errno) +{ + struct dirent *ret; + + errno = 0; + if (!dirp) + return (NULL); + ret = readdir(dirp); + *readdir_errno = errno; + return (ret); +} + /* * This is the tricky part -- do not casually change *anything* in here. The * idea is to build the linked list of entries that are used by fts_children @@ -627,7 +640,8 @@ fts_build(FTS *sp, int type) DIR *dirp; void *oldaddr; char *cp; - int cderrno, descend, oflag, saved_errno, nostat, doadjust; + int cderrno, descend, oflag, saved_errno, nostat, doadjust, + readdir_errno; long level; long nlinks; /* has to be signed because -1 is a magic value */ size_t dnamlen, len, maxlen, nitems; @@ -733,7 +747,9 @@ fts_build(FTS *sp, int type) /* Read the directory, attaching each entry to the `link' pointer. */ doadjust = 0; - for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) { + readdir_errno = 0; + for (head = tail = NULL, nitems = 0; + (dp = fts_safe_readdir(dirp, &readdir_errno));) { dnamlen = dp->d_namlen; if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) continue; @@ -819,6 +835,16 @@ mem1: saved_errno = errno; } ++nitems; } + + if (readdir_errno) { + cur->fts_errno = readdir_errno; + /* + * If we've not read any items yet, treat + * the error as if we can't access the dir. + */ + cur->fts_info = nitems ? FTS_ERR : FTS_DNR; + } + if (dirp) (void)closedir(dirp); @@ -855,7 +881,8 @@ mem1: saved_errno = errno; /* If didn't find anything, return NULL. */ if (!nitems) { - if (type == BREAD) + if (type == BREAD && + cur->fts_info != FTS_DNR && cur->fts_info != FTS_ERR) cur->fts_info = FTS_DP; return (NULL); }