From patchwork Fri Aug 30 19:52:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 96818 X-Patchwork-Delegate: dj@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5C4DA3864832 for ; Fri, 30 Aug 2024 19:53:07 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 062E4384CBA1 for ; Fri, 30 Aug 2024 19:52:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 062E4384CBA1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 062E4384CBA1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725047556; cv=none; b=f57abfzyckzKbwyzlKpnbEsfvv9maOXqHPN64IOYXw30lH3+NmWKNDD3zk4I+oQ8uRNfh/V4gzWXJ4bf4CaOim2wwCiOzQwKVZ1g8PXkwh9fcOHh7OZYQXc7Vtf6UGpe4YQpwhL7cVr+KYlejfj3jHgc5QXvMrTcdNqtX1DeVZo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1725047556; c=relaxed/simple; bh=OZcPbatKf0idjPtejiXGExoFwLhqaFaPx0CWzjYXplE=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=H0dMwcmNDJhwlJUI5Jkk73PNldInVYJwSVuugxO7jpxNd5xgTotrDAdAvKdXsQdCF8440J+L09ynbwY5KTxsAv3Mpb3vTwKh6ZAh7GfPHUXCkCPlNlPEaubXrwgErNjxSjqAhrPgDS5Jj4xA/b9y0j/n8e+3KzHwrholahLI2hk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725047551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=vthv+HCL4bD7TGT1sY9l/ikNlU7TSxDKugSOAtv9pAM=; b=cNtT8ywCj0oeq6rsCy71wiNGt8vd1jUAjYHDinYW/9F1ehrKQ6TazOLMjeVTR5Sx7laTda fxx1j/g+efumlQqjjroC7RvkmibX/jmkAoch+NqiA8ffhcdM66zcd6WdcXy73m1muLzPo5 qiZSKf6J+JrPjpa3XbCs/mLRQhYWdD4= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-193-8kOWRfOYPBOHdY7IMS8vNA-1; Fri, 30 Aug 2024 15:52:29 -0400 X-MC-Unique: 8kOWRfOYPBOHdY7IMS8vNA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8A3AD1954B04 for ; Fri, 30 Aug 2024 19:52:27 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.7]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 591E819560A3 for ; Fri, 30 Aug 2024 19:52:26 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v4 03/13] Linux: readdir_r needs to report getdents failures (bug 32124) In-Reply-To: Message-ID: <69eb384e8ded80045d1a559186b8c0be1e354b0a.1725047142.git.fweimer@redhat.com> References: X-From-Line: 69eb384e8ded80045d1a559186b8c0be1e354b0a Mon Sep 17 00:00:00 2001 Date: Fri, 30 Aug 2024 21:52:23 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Upon error, return the errno value set by the __getdents call in __readdir_unlocked. Previously, kernel-reported errors were ignored. Reviewed-by: DJ Delorie --- support/support_readdir_check.c | 3 +- support/support_readdir_r_check.c | 10 ++++- support/tst-xdirent.c | 22 +++++++---- support/xdirent.h | 57 +++++++++++++++++++++++------ sysdeps/unix/sysv/linux/readdir_r.c | 11 +++++- 5 files changed, 79 insertions(+), 24 deletions(-) diff --git a/support/support_readdir_check.c b/support/support_readdir_check.c index 8d48a4c5a4..5687004276 100644 --- a/support/support_readdir_check.c +++ b/support/support_readdir_check.c @@ -21,9 +21,10 @@ #include void * -support_readdir_check (const char *name, void *result) +support_readdir_check (const char *name, void *result, int saved_errno) { if (result == NULL && errno != 0) FAIL_EXIT1 ("%s: %m", name); + errno = saved_errno; return result; } diff --git a/support/support_readdir_r_check.c b/support/support_readdir_r_check.c index 8675b08ff3..6bbb0d0b32 100644 --- a/support/support_readdir_r_check.c +++ b/support/support_readdir_r_check.c @@ -21,9 +21,15 @@ #include int -support_readdir_r_check (const char *name, int result) +support_readdir_r_check (const char *name, int result, void *buf, void *ptr) { if (result != 0) - FAIL_EXIT1 ("%s: %m", name); + { + errno = result; + FAIL_EXIT1 ("%s: %m", name); + } + if (buf != ptr) + FAIL_EXIT1 ("%s: buffer pointer and returned pointer differ: %p != %p", + name, buf, ptr); return result; } diff --git a/support/tst-xdirent.c b/support/tst-xdirent.c index 7012b3185b..642483165a 100644 --- a/support/tst-xdirent.c +++ b/support/tst-xdirent.c @@ -30,6 +30,8 @@ do_test (void) struct dirent *e = xreaddir (d); /* Assume that the "." special entry always comes first. */ TEST_COMPARE_STRING (e->d_name, "."); + while (xreaddir (d) != NULL) + ; xclosedir (d); } @@ -37,6 +39,8 @@ do_test (void) DIR *d = xopendir ("."); struct dirent64 *e = xreaddir64 (d); TEST_COMPARE_STRING (e->d_name, "."); + while (xreaddir64 (d) != NULL) + ; xclosedir (d); } @@ -46,19 +50,21 @@ do_test (void) { DIR *d = xopendir ("."); - struct dirent buf; - struct dirent *e; - TEST_COMPARE (xreaddir_r (d, &buf, &e), 0); - TEST_COMPARE_STRING (e->d_name, "."); + struct dirent buf = { 0, }; + TEST_VERIFY (xreaddir_r (d, &buf)); + TEST_COMPARE_STRING (buf.d_name, "."); + while (xreaddir_r (d, &buf)) + ; xclosedir (d); } { DIR *d = xopendir ("."); - struct dirent64 buf; - struct dirent64 *e; - TEST_COMPARE (xreaddir64_r (d, &buf, &e), 0); - TEST_COMPARE_STRING (e->d_name, "."); + struct dirent64 buf = { 0, }; + TEST_VERIFY (xreaddir64_r (d, &buf)); + TEST_COMPARE_STRING (buf.d_name, "."); + while (xreaddir64_r (d, &buf)) + ; xclosedir (d); } diff --git a/support/xdirent.h b/support/xdirent.h index 83f41dba6b..8465d70ec1 100644 --- a/support/xdirent.h +++ b/support/xdirent.h @@ -22,6 +22,8 @@ #include #include #include +#include +#include __BEGIN_DECLS @@ -29,23 +31,54 @@ DIR *xopendir (const char *path); DIR *xfdopendir (int fd); void xclosedir (DIR *); -void *support_readdir_check (const char *, void *); -#define xreaddir(d) \ - ((struct dirent *) support_readdir_check ("readdir", \ - (errno = 0, readdir ((d))))) -#define xreaddir64(d) \ - ((struct dirent64 *) support_readdir_check ("readdir64", \ - (errno = 0, readdir64 ((d))))) +void *support_readdir_check (const char *, void *, int); -int support_readdir_r_check (const char *, int); +static __attribute__ ((unused)) struct dirent * +xreaddir (DIR *stream) +{ + int saved_errno = errno; + errno = 0; + struct dirent *result = readdir (stream); + return support_readdir_check ("readdir", result, saved_errno); +} + +static __attribute__ ((unused)) struct dirent64 * +xreaddir64 (DIR *stream) +{ + int saved_errno = errno; + errno = 0; + struct dirent64 *result = readdir64 (stream); + return support_readdir_check ("readdir64", result, saved_errno); +} /* The functions readdir_r, readdir64_r were deprecated in glibc 2.24. */ DIAG_PUSH_NEEDS_COMMENT; DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations"); -#define xreaddir_r(d, e, r) \ - (support_readdir_r_check ("readdir_r", readdir_r ((d), (e), (r)))) -#define xreaddir64_r(d, e, r) \ - (support_readdir_r_check ("readdir64_r", readdir64_r ((d), (e), (r)))) + +int support_readdir_r_check (const char *, int, void *, void *); + +static __attribute__ ((unused)) bool +xreaddir_r (DIR *stream, struct dirent *buf) +{ + struct dirent *ptr; + int ret = readdir_r (stream, buf, &ptr); + if (ret == 0 && ptr == NULL) + return false; + support_readdir_r_check ("readdir_r", ret, buf, ptr); + return true; +} + +static __attribute__ ((unused)) bool +xreaddir64_r (DIR *stream, struct dirent64 *buf) +{ + struct dirent64 *ptr; + int ret = readdir64_r (stream, buf, &ptr); + if (ret == 0 && ptr == NULL) + return false; + support_readdir_r_check ("readdir64_r", ret, buf, ptr); + return true; +} + DIAG_POP_NEEDS_COMMENT; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/readdir_r.c b/sysdeps/unix/sysv/linux/readdir_r.c index ffd5262cf5..1d595688f7 100644 --- a/sysdeps/unix/sysv/linux/readdir_r.c +++ b/sysdeps/unix/sysv/linux/readdir_r.c @@ -25,14 +25,22 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) { struct dirent *dp; size_t reclen; + int saved_errno = errno; __libc_lock_lock (dirp->lock); while (1) { + /* If errno is changed from 0, the NULL return value indicates + an actual error. It overrides a pending ENAMETOOLONG error. */ + __set_errno (0); dp = __readdir_unlocked (dirp); if (dp == NULL) - break; + { + if (errno != 0) + dirp->errcode = errno; + break; + } reclen = dp->d_reclen; if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1) @@ -61,6 +69,7 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) __libc_lock_unlock (dirp->lock); + __set_errno (saved_errno); return dp != NULL ? 0 : dirp->errcode; }