From patchwork Fri Jan 27 17:28:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63808 X-Patchwork-Delegate: fweimer@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 BF67D38493DB for ; Fri, 27 Jan 2023 17:29:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF67D38493DB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674840550; bh=iBL92Gp1K9pw+NViykFNtdBYfQuuNoAUnUiova+laCU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=MgJO2i8D2LCpe/dyuaV2b9CcpdtG49qW9JpKM87OOp8DW12DC0UZaK0fBxlE2/edh 4Atea/+zJslSv0INqmjELayjM7uCfJ47wcnw7nEhQ60E+q7CHuV3FNoYsmK9vK+3zX msVy8jid63NXVLcl3CBPvJp7q8vRYPFojFK6PbQ4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by sourceware.org (Postfix) with ESMTPS id 20CA2385AC39 for ; Fri, 27 Jan 2023 17:28:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 20CA2385AC39 Received: by mail-oi1-x22b.google.com with SMTP id s66so4734717oib.7 for ; Fri, 27 Jan 2023 09:28:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iBL92Gp1K9pw+NViykFNtdBYfQuuNoAUnUiova+laCU=; b=I1udlWCeI4zz2g3EzpMvK+qzH1DQXBiMobsVX2KX4rCDVnlX8lIpv7x/LhsTc7D1v5 syAMSHN1CzYs+7VdH7wTObsyLWYq1ZJ9hoFSrfGGnJ36NNeT/2H4Qt+0fQlFYOWfYIyp NXTPuRQ3f73HS1oOCkxUN1aTxFTH4YessXee1lzyuA0Eazg6SQfrUA3Nn6rNlb8SDUbr QJc8VrsPRGoFhLwiIjRSpN3bBoZwXZpdzljyivPYfzvgWcvXTXmDfHFFqUyBoRcQYnWd Oy//krq1Aa2TCPtyYGfZKjP+H56tugAqDymjob2PInZhAq8GmpCn+5Eq+0Zjk2sLoMI4 N0mg== X-Gm-Message-State: AFqh2kqodVHVr/bQMTYLIW9mDrJLbJfERMU3l2l91nKTshcsBuprZx7z zOSpbfuv6vnpZkqLuqTTSwMMHixTOjlAy28P0hU= X-Google-Smtp-Source: AMrXdXs+TrZnCd0Ps/v1BZqTxOQjF7pBA2kYHxxpWleLDKGbBgRu5FH/VNVS8CL5I1qwJ7GAd8TWxQ== X-Received: by 2002:a05:6808:8f6:b0:360:c4f3:ec79 with SMTP id d22-20020a05680808f600b00360c4f3ec79mr17490902oic.33.1674840522148; Fri, 27 Jan 2023 09:28:42 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:a00f:8f3d:7ba5:11f1]) by smtp.gmail.com with ESMTPSA id r131-20020acada89000000b0035aa617156bsm1803940oig.17.2023.01.27.09.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 09:28:40 -0800 (PST) To: libc-alpha@sourceware.org, "Andreas K . Huettel" , Paul Eggert , Florian Weimer Subject: [PATCH v5 1/5] linux: Use getdents64 on non-LFS readdir Date: Fri, 27 Jan 2023 14:28:30 -0300 Message-Id: <20230127172834.391311-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127172834.391311-1-adhemerval.zanella@linaro.org> References: <20230127172834.391311-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The non-LFS opendir reserves a translation entry to be used to return the entry and the dirent64 struct is translated to the temporary buffer on each readdir call. Entries that overflow d_off/d_ino and the buffer reallocation failure (in case of large d_name) are ignored. Checked on x86_64-linux-gnu and i686-linux-gnu. --- dirent/tst-scandir.c | 6 ++- include/dirent.h | 2 +- sysdeps/unix/sysv/linux/dirstream.h | 5 ++ sysdeps/unix/sysv/linux/readdir.c | 83 +++++++++++++++++++---------- 4 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dirent/tst-scandir.c b/dirent/tst-scandir.c index 8d87d4dd74..7bc666449e 100644 --- a/dirent/tst-scandir.c +++ b/dirent/tst-scandir.c @@ -155,8 +155,12 @@ do_test (void) } if (n != 6) { + /* Non-lfs opendir skips entries that can not be represented (for + instance if d_off is not an offset but rather an internal filesystem + representation. For this case there is no point in continue the + testcase. */ printf ("scandir returned %d entries instead of 6\n", n); - return 1; + return EXIT_UNSUPPORTED; } struct diff --git a/include/dirent.h b/include/dirent.h index d7567f5e86..17827176ba 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -1,8 +1,8 @@ #ifndef _DIRENT_H +# include # ifndef _ISOMAC # include # endif -# include # ifndef _ISOMAC # include # include diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h index 3cb313b410..adcf8234f1 100644 --- a/sysdeps/unix/sysv/linux/dirstream.h +++ b/sysdeps/unix/sysv/linux/dirstream.h @@ -18,6 +18,7 @@ #ifndef _DIRSTREAM_H #define _DIRSTREAM_H 1 +#include #include #include @@ -41,6 +42,10 @@ struct __dirstream int errcode; /* Delayed error code. */ +#if !defined __OFF_T_MATCHES_OFF64_T || !defined __INO_T_MATCHES_INO64_T + struct dirent tdp; +#endif + /* Directory block. We must make sure that this block starts at an address that is aligned adequately enough to store dirent entries. Using the alignment of "void *" is not diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c index 4a4c00ea07..cd0ccaf33a 100644 --- a/sysdeps/unix/sysv/linux/readdir.c +++ b/sysdeps/unix/sysv/linux/readdir.c @@ -21,42 +21,71 @@ #if !_DIRENT_MATCHES_DIRENT64 #include +/* Translate the DP64 entry to the non-LFS one in the translation entry + at dirstream DS. Return true is the translation was possible or + false if either an internal field can not be represented in the non-LFS + entry or if the name is too long. */ +static bool +dirstream_entry (struct __dirstream *ds, const struct dirent64 *dp64) +{ + /* Check for overflow. */ + if (!in_off_t_range (dp64->d_off) || !in_ino_t_range (dp64->d_ino)) + return false; + + /* And if name is too large. */ + if (dp64->d_reclen - offsetof (struct dirent64, d_name) > NAME_MAX) + return false; + + ds->filepos = dp64->d_off; + + ds->tdp.d_off = dp64->d_off; + ds->tdp.d_ino = dp64->d_ino; + ds->tdp.d_reclen = sizeof (struct dirent) + + dp64->d_reclen - offsetof (struct dirent64, d_name); + ds->tdp.d_type = dp64->d_type; + memcpy (ds->tdp.d_name, dp64->d_name, + dp64->d_reclen - offsetof (struct dirent64, d_name)); + + return true; +} + /* Read a directory entry from DIRP. */ struct dirent * __readdir_unlocked (DIR *dirp) { - struct dirent *dp; int saved_errno = errno; - if (dirp->offset >= dirp->size) + while (1) { - /* We've emptied out our buffer. Refill it. */ - - size_t maxread = dirp->allocation; - ssize_t bytes; - - bytes = __getdents (dirp->fd, dirp->data, maxread); - if (bytes <= 0) + if (dirp->offset >= dirp->size) { - /* Linux may fail with ENOENT on some file systems if the - directory inode is marked as dead (deleted). POSIX - treats this as a regular end-of-directory condition, so - do not set errno in that case, to indicate success. */ - if (bytes == 0 || errno == ENOENT) - __set_errno (saved_errno); - return NULL; - } - dirp->size = (size_t) bytes; - - /* Reset the offset into the buffer. */ - dirp->offset = 0; + /* We've emptied out our buffer. Refill it. */ + ssize_t bytes = __getdents64 (dirp->fd, dirp->data, + dirp->allocation); + if (bytes <= 0) + { + /* Linux may fail with ENOENT on some file systems if the + directory inode is marked as dead (deleted). POSIX + treats this as a regular end-of-directory condition, so + do not set errno in that case, to indicate success. */ + if (bytes < 0 && errno == ENOENT) + __set_errno (saved_errno); + return NULL; + } + dirp->size = bytes; + + /* Reset the offset into the buffer. */ + dirp->offset = 0; + } + + struct dirent64 *dp64 = (struct dirent64 *) &dirp->data[dirp->offset]; + dirp->offset += dp64->d_reclen; + + /* Skip entries which might overflow d_off/d_ino or if the translation + buffer can not be resized. */ + if (dirstream_entry (dirp, dp64)) + return &dirp->tdp; } - - dp = (struct dirent *) &dirp->data[dirp->offset]; - dirp->offset += dp->d_reclen; - dirp->filepos = dp->d_off; - - return dp; } struct dirent * From patchwork Fri Jan 27 17:28:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63809 X-Patchwork-Delegate: fweimer@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 96FBE38493D6 for ; Fri, 27 Jan 2023 17:29:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 96FBE38493D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674840556; bh=p23K7/WoqyDGhcw9xCU7eP4HK+rYJhi5wRiSu9vos/s=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=rKbvE4MeTiU7DQ9CBnz+iQq1vnnwoLFj/8QlQpYJJhO+3LvrjuneYJmLUMo8OOO1y A44eGqvmJ6pTEPlhqGAZQR2CY0mUcIq3hQdBVjqOPm/Dj1OMe8BTwfPMUTsCZUYjR7 +7JDyfZtrsLTlIw1zOd8OlWp7oJ1Sb//qayDQc30= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id C1886385AC29 for ; Fri, 27 Jan 2023 17:28:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C1886385AC29 Received: by mail-oi1-x22c.google.com with SMTP id p185so4758731oif.2 for ; Fri, 27 Jan 2023 09:28:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p23K7/WoqyDGhcw9xCU7eP4HK+rYJhi5wRiSu9vos/s=; b=vceIqfw1cL3ZFQNEtUC1kX54hSznOPfIKnuxgd0/aNtP9etx4tP36q4kU6p6U0lkKd dNJ761HM12zrCDPnA0GFveHdCVJrXXLzMEHeIAZMZKWh0wta6OZ8/O8iOH1UAOPwVuYD i+OjRWwTrbXF1TGB1B0Bpm9VfqfaKozCXqLJU/Strsu7wCZwL5885pnfVBDV5ExC64BQ pd7ZEk47ExM+ZlV06glyIap9xgbHjhZtX8ZLcHkZ5/GbG3N//TBN3B9xd5GtAjgdU0Ph SOqw7qaeDZ2FGsDnuAth+sRjKwnPdO0/XfAXYzoDebPnj4+QM8Ki8WnrvejGVJ1FSCqm BveQ== X-Gm-Message-State: AFqh2krxsSvDvlWV4fllzsGbCppWV+QCFysecRgPXOVG2bFHdCskRSGx ndgHoqT9M7/jUkz3yHGA6hGeLnhs1WmPUFryQqM= X-Google-Smtp-Source: AMrXdXsYB/SHVu400P1teVw36YOfx94y7MaCD5odxAE9blROlbhTqC+9j9l/Sgk0LvngCsgA5+z7Fw== X-Received: by 2002:aca:df45:0:b0:364:8e7d:6afc with SMTP id w66-20020acadf45000000b003648e7d6afcmr17085765oig.41.1674840528159; Fri, 27 Jan 2023 09:28:48 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:a00f:8f3d:7ba5:11f1]) by smtp.gmail.com with ESMTPSA id r131-20020acada89000000b0035aa617156bsm1803940oig.17.2023.01.27.09.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 09:28:43 -0800 (PST) To: libc-alpha@sourceware.org, "Andreas K . Huettel" , Paul Eggert , Florian Weimer Subject: [PATCH v5 2/5] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ #24050) Date: Fri, 27 Jan 2023 14:28:31 -0300 Message-Id: <20230127172834.391311-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127172834.391311-1-adhemerval.zanella@linaro.org> References: <20230127172834.391311-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It allows to obtain the expected entry offset on telldir and set it correctly on seekdir on platforms where long int is smaller than off64_t. On such cases opendir creates a map entry between the DIR d_off offset and the returned long int (the telldir return value). seekdir will then set the correct offset from the internal list using the telldir as the list key. It also removes the overflow check on readdir and the returned value will be truncated by the non-LFS off_t size. As Joseph has noted in BZ #23960 comment #22, d_off is an opaque value and since telldir/seekdir works regardless of the returned dirent d_off value. Finally it removes the requirement to check for overflow values on telldir (BZ #24050). Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc-linux-gnu, and arm-linux-gnueabihf. --- dirent/tst-seekdir.c | 8 ++ sysdeps/unix/sysv/linux/Makefile | 1 + sysdeps/unix/sysv/linux/alpha/bits/dirent.h | 3 + sysdeps/unix/sysv/linux/bits/dirent.h | 4 + sysdeps/unix/sysv/linux/closedir.c | 4 + sysdeps/unix/sysv/linux/dirstream.h | 6 +- sysdeps/unix/sysv/linux/opendir.c | 3 + sysdeps/unix/sysv/linux/readdir.c | 11 +- sysdeps/unix/sysv/linux/rewinddir.c | 5 + sysdeps/unix/sysv/linux/seekdir.c | 35 ++++- sysdeps/unix/sysv/linux/telldir.c | 35 +++++ sysdeps/unix/sysv/linux/telldir.h | 65 +++++++++ sysdeps/unix/sysv/linux/tst-opendir-nolfs.c | 146 ++++++++++++++++++++ 13 files changed, 319 insertions(+), 7 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/telldir.h create mode 100644 sysdeps/unix/sysv/linux/tst-opendir-nolfs.c diff --git a/dirent/tst-seekdir.c b/dirent/tst-seekdir.c index dcdd699b09..187eda7584 100644 --- a/dirent/tst-seekdir.c +++ b/dirent/tst-seekdir.c @@ -41,6 +41,14 @@ do_test (void) if (i == 400) break; } + if (i < 3) + { + /* Non-lfs opendir skips entries that can not be represented (for + instance if d_off is not an offset but rather an internal filesystem + representation. For this case there is no point in continue the + testcase. */ + return 77; + } printf ("going back past 4-th entry...\n"); diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index f298878e8f..33708f910b 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -465,6 +465,7 @@ ifeq ($(subdir),dirent) sysdep_routines += getdirentries getdirentries64 tests += \ tst-getdents64 \ + tst-opendir-nolfs \ tst-readdir64-compat \ # tests endif # $(subdir) == dirent diff --git a/sysdeps/unix/sysv/linux/alpha/bits/dirent.h b/sysdeps/unix/sysv/linux/alpha/bits/dirent.h index c8a0cfe93f..586d75586a 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/dirent.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/dirent.h @@ -54,4 +54,7 @@ struct dirent64 /* Inform libc code that these two types are effectively identical. */ #define _DIRENT_MATCHES_DIRENT64 1 +/* alpha 'long int' is enough to handle off64_t. */ +#define _DIRENT_OFFSET_TRANSLATION 0 + #endif /* bits/dirent.h */ diff --git a/sysdeps/unix/sysv/linux/bits/dirent.h b/sysdeps/unix/sysv/linux/bits/dirent.h index ab34d986ff..bb02dcb70a 100644 --- a/sysdeps/unix/sysv/linux/bits/dirent.h +++ b/sysdeps/unix/sysv/linux/bits/dirent.h @@ -57,3 +57,7 @@ struct dirent64 #else # define _DIRENT_MATCHES_DIRENT64 0 #endif + +/* The telldir function returns long int, which may not be large enough to + store off64_t values. In this case, translation is required. */ +#define _DIRENT_OFFSET_TRANSLATION (LONG_WIDTH < 64) diff --git a/sysdeps/unix/sysv/linux/closedir.c b/sysdeps/unix/sysv/linux/closedir.c index f1c2608642..9585a6ca3a 100644 --- a/sysdeps/unix/sysv/linux/closedir.c +++ b/sysdeps/unix/sysv/linux/closedir.c @@ -47,6 +47,10 @@ __closedir (DIR *dirp) __libc_lock_fini (dirp->lock); #endif +#if _DIRENT_OFFSET_TRANSLATION + dirstream_loc_clear (&dirp->locs); +#endif + free ((void *) dirp); return __close_nocancel (fd); diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h index adcf8234f1..8f58a1c3a6 100644 --- a/sysdeps/unix/sysv/linux/dirstream.h +++ b/sysdeps/unix/sysv/linux/dirstream.h @@ -22,6 +22,7 @@ #include #include +#include /* Directory stream type. @@ -38,13 +39,16 @@ struct __dirstream size_t size; /* Total valid data in the block. */ size_t offset; /* Current offset into the block. */ - off_t filepos; /* Position of next entry to read. */ + off64_t filepos; /* Position of next entry to read. */ int errcode; /* Delayed error code. */ #if !defined __OFF_T_MATCHES_OFF64_T || !defined __INO_T_MATCHES_INO64_T struct dirent tdp; #endif +#if _DIRENT_OFFSET_TRANSLATION + struct dirstream_loc_t locs; /* off64_t to long int map for telldir. */ +#endif /* Directory block. We must make sure that this block starts at an address that is aligned adequately enough to store diff --git a/sysdeps/unix/sysv/linux/opendir.c b/sysdeps/unix/sysv/linux/opendir.c index 4336196a4d..3e2caabb9d 100644 --- a/sysdeps/unix/sysv/linux/opendir.c +++ b/sysdeps/unix/sysv/linux/opendir.c @@ -129,6 +129,9 @@ __alloc_dir (int fd, bool close_fd, int flags, dirp->offset = 0; dirp->filepos = 0; dirp->errcode = 0; +#if _DIRENT_OFFSET_TRANSLATION + dirstream_loc_init (&dirp->locs); +#endif return dirp; } diff --git a/sysdeps/unix/sysv/linux/readdir.c b/sysdeps/unix/sysv/linux/readdir.c index cd0ccaf33a..7a7f484c36 100644 --- a/sysdeps/unix/sysv/linux/readdir.c +++ b/sysdeps/unix/sysv/linux/readdir.c @@ -36,6 +36,15 @@ dirstream_entry (struct __dirstream *ds, const struct dirent64 *dp64) if (dp64->d_reclen - offsetof (struct dirent64, d_name) > NAME_MAX) return false; + /* telldir can not return an error, so preallocate the map if the entry can + not be packed directly. */ + if (telldir_need_dirstream (dp64->d_off)) + { + dirstream_loc_add (&ds->locs, dp64->d_off); + if (dirstream_loc_has_failed (&ds->locs)) + return false; + } + ds->filepos = dp64->d_off; ds->tdp.d_off = dp64->d_off; @@ -76,7 +85,7 @@ __readdir_unlocked (DIR *dirp) /* Reset the offset into the buffer. */ dirp->offset = 0; - } + } struct dirent64 *dp64 = (struct dirent64 *) &dirp->data[dirp->offset]; dirp->offset += dp64->d_reclen; diff --git a/sysdeps/unix/sysv/linux/rewinddir.c b/sysdeps/unix/sysv/linux/rewinddir.c index c0fb7aa765..1b158a584f 100644 --- a/sysdeps/unix/sysv/linux/rewinddir.c +++ b/sysdeps/unix/sysv/linux/rewinddir.c @@ -33,6 +33,11 @@ __rewinddir (DIR *dirp) dirp->offset = 0; dirp->size = 0; dirp->errcode = 0; + +#ifndef __LP64__ + dirstream_loc_clear (&dirp->locs); +#endif + #if IS_IN (libc) __libc_lock_unlock (dirp->lock); #endif diff --git a/sysdeps/unix/sysv/linux/seekdir.c b/sysdeps/unix/sysv/linux/seekdir.c index 939ccc4447..30cce691a4 100644 --- a/sysdeps/unix/sysv/linux/seekdir.c +++ b/sysdeps/unix/sysv/linux/seekdir.c @@ -22,14 +22,39 @@ #include /* Seek to position POS in DIRP. */ -/* XXX should be __seekdir ? */ void seekdir (DIR *dirp, long int pos) { + off64_t filepos; + __libc_lock_lock (dirp->lock); - (void) __lseek (dirp->fd, pos, SEEK_SET); - dirp->size = 0; - dirp->offset = 0; - dirp->filepos = pos; + +#if _DIRENT_OFFSET_TRANSLATION + union dirstream_packed dsp = { .l = pos }; + if (dsp.p.is_packed == 1) + filepos = dsp.p.info; + else + { + size_t index = dsp.p.info; + + if (index >= dirstream_loc_size (&dirp->locs)) + { + __libc_lock_unlock (dirp->lock); + return; + } + filepos = *dirstream_loc_at (&dirp->locs, index); + } +#else + filepos = pos; +#endif + + if (dirp->filepos != filepos) + { + __lseek64 (dirp->fd, filepos, SEEK_SET); + dirp->filepos = filepos; + dirp->offset = 0; + dirp->size = 0; + } + __libc_lock_unlock (dirp->lock); } diff --git a/sysdeps/unix/sysv/linux/telldir.c b/sysdeps/unix/sysv/linux/telldir.c index 1e5c129e9f..c3ef14f3da 100644 --- a/sysdeps/unix/sysv/linux/telldir.c +++ b/sysdeps/unix/sysv/linux/telldir.c @@ -15,9 +15,11 @@ License along with the GNU C Library; if not, see . */ +#include #include #include +#include /* Return the current position of DIRP. */ long int @@ -26,7 +28,40 @@ telldir (DIR *dirp) long int ret; __libc_lock_lock (dirp->lock); + +#if _DIRENT_OFFSET_TRANSLATION + /* If the directory position fits in the packet structure, returns it. + Otherwise, check if the position is already been recorded in the + dynamic array. If not, add the new record. */ + + union dirstream_packed dsp; + + if (!telldir_need_dirstream (dirp->filepos)) + { + dsp.p.is_packed = 1; + dsp.p.info = dirp->filepos; + } + else + { + dsp.l = -1; + + size_t i; + for (i = 0; i < dirstream_loc_size (&dirp->locs); i++) + if (*dirstream_loc_at (&dirp->locs, i) == dirp->filepos) + break; + /* It should be pre-allocated on readdir. */ + assert (i != dirstream_loc_size (&dirp->locs)); + + dsp.p.is_packed = 0; + /* This assignment might overflow, however most likely ENOME would + happen long before. */ + dsp.p.info = i; + } + + ret = dsp.l; +#else ret = dirp->filepos; +#endif __libc_lock_unlock (dirp->lock); return ret; diff --git a/sysdeps/unix/sysv/linux/telldir.h b/sysdeps/unix/sysv/linux/telldir.h new file mode 100644 index 0000000000..758bcb0eb3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/telldir.h @@ -0,0 +1,65 @@ +/* Linux internal telldir definitions. + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _TELLDIR_H +#define _TELLDIR_H 1 + +#if _DIRENT_OFFSET_TRANSLATION +/* On platforms where 'long int' is smaller than 'off64_t' this is how the + returned value is encoded and returned by 'telldir'. If the directory + offset can be enconded in 31 bits it is returned in the 'info' member + with 'is_packed' set to 1. + + Otherwise, the 'info' member describes an index in a dynamic array at + 'DIR' structure. */ + +union dirstream_packed +{ + long int l; + struct + { + unsigned long int is_packed:1; + unsigned long int info:31; + } p; +}; + +_Static_assert (sizeof (long int) == sizeof (union dirstream_packed), + "sizeof (long int) != sizeof (union dirstream_packed)"); + +/* telldir maintains a list of offsets that describe the obtained diretory + position if it can fit this information in the returned 'dirstream_packed' + struct. */ + +# define DYNARRAY_STRUCT dirstream_loc_t +# define DYNARRAY_ELEMENT off64_t +# define DYNARRAY_PREFIX dirstream_loc_ +# include + +static __always_inline bool +telldir_need_dirstream (__off64_t d_off) +{ + return d_off >= 1UL << 31; +} +#else + +_Static_assert (sizeof (long int) == sizeof (off64_t), + "sizeof (long int) != sizeof (off64_t)"); + +#endif /* __LP64__ */ + +#endif /* _TELLDIR_H */ diff --git a/sysdeps/unix/sysv/linux/tst-opendir-nolfs.c b/sysdeps/unix/sysv/linux/tst-opendir-nolfs.c new file mode 100644 index 0000000000..52e18171a7 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-opendir-nolfs.c @@ -0,0 +1,146 @@ +/* Check multiple telldir and seekdir. + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +/* Some filesystems returns an arbitrary value for d_off direnty entry (ext4 + for instance, where the value is an internal hash key). The idea of create + a large number of file is to try trigger a overflow d_off value in a entry + to check if telldir/seekdir does work corretly in such case. */ +static const char *dirname; +/* The 2 extra files are '.' and '..'. */ +static const size_t nfiles = (1<<14) + 2; + +static inline bool +in_ino_t_range (ino64_t v) +{ + ino_t s = v; + return s == v; +} + +static inline bool +in_off_t_range (off64_t v) +{ + off_t s = v; + return s == v; +} + +static void +do_prepare (int argc, char *argv[]) +{ + dirname = support_create_temp_directory ("tst-opendir-nolfs-"); + + for (size_t i = 0; i < nfiles - 2; i++) + { + int fd = create_temp_file_in_dir ("tempfile.", dirname, NULL); + TEST_VERIFY_EXIT (fd > 0); + close (fd); + } +} +#define PREPARE do_prepare + +static int +do_test (void) +{ + DIR *dirp = opendir (dirname); + TEST_VERIFY_EXIT (dirp != NULL); + + long int *tdirp = xmalloc (nfiles * sizeof (long int)); + struct dirent **ddirp = xmalloc (nfiles * sizeof (struct dirent *)); + + /* For non-LFS, the entry is skipped if it can not be converted. */ + int count = 0; + for (; count < nfiles; count++) + { + tdirp[count] = telldir (dirp); + struct dirent *dp = readdir (dirp); + if (dp == NULL) + break; + ddirp[count] = xmalloc (dp->d_reclen); + memcpy (ddirp[count], dp, dp->d_reclen); + } + + closedir (dirp); + + /* Check against the getdents64 syscall. */ + int fd = xopen (dirname, O_RDONLY | O_DIRECTORY, 0); + int i = 0; + while (true) + { + struct + { + char buffer[1024]; + struct dirent64 pad; + } data; + + ssize_t ret = getdents64 (fd, &data.buffer, sizeof (data.buffer)); + if (ret < 0) + FAIL_EXIT1 ("getdents64: %m"); + if (ret == 0) + break; + + char *current = data.buffer; + char *end = data.buffer + ret; + while (current != end) + { + struct dirent64 entry; + memcpy (&entry, current, sizeof (entry)); + /* Truncate overlong strings. */ + entry.d_name[sizeof (entry.d_name) - 1] = '\0'; + TEST_VERIFY (strlen (entry.d_name) < sizeof (entry.d_name) - 1); + + if (in_ino_t_range (entry.d_ino) && in_off_t_range (entry.d_off)) + { + TEST_COMPARE_STRING (entry.d_name, ddirp[i]->d_name); + TEST_COMPARE (entry.d_ino, ddirp[i]->d_ino); + TEST_COMPARE (entry.d_off, ddirp[i]->d_off); + TEST_COMPARE (entry.d_type, ddirp[i]->d_type); + + /* Offset zero is reserved for the first entry. */ + TEST_VERIFY (entry.d_off != 0); + + TEST_VERIFY_EXIT (entry.d_reclen <= end - current); + i++; + } + + current += entry.d_reclen; + } + } + + /* direntries_read has been called more than once. */ + TEST_COMPARE (count, i); + + free (tdirp); + for (int i = 0; i < count; i++) + free (ddirp[i]); + free (ddirp); + + return 0; +} + +#include From patchwork Fri Jan 27 17:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63811 X-Patchwork-Delegate: fweimer@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 13ABF3887F47 for ; Fri, 27 Jan 2023 17:29:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13ABF3887F47 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674840591; bh=o2tpFjiSTKzuUsNPGft3LdlxIcipwUC8LWTHKf5ayng=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Tn32R6zuqdjs4txzee3qycdknNWKuBDN2uH5YcFbkGzUz9tdmyBcbG/76/NtZwp1t WTZFQ+zekQWPZjyVIOK8o3B01lUAaHmOG88v8nj+pBQcSRfMhsOKC0CMunZ2JYSosW QnFR6IDaMPdeTr8PahITytXd9SegG24Uc1q3J7ZY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id 45945385B50A for ; Fri, 27 Jan 2023 17:28:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 45945385B50A Received: by mail-oi1-x233.google.com with SMTP id o66so4739113oia.6 for ; Fri, 27 Jan 2023 09:28:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o2tpFjiSTKzuUsNPGft3LdlxIcipwUC8LWTHKf5ayng=; b=65EWf1c3Jz6VemebUh8uVwLhr+CMtpeF6hDG+YfyioYTwX8WDldnyEh+ecsXEOi3vD vk6V5LcE0POUAOcfdROda0tO3bOXp2i3d8ZbAmdlkNORk0gUA9zCsBdzlwwYj/AXdwWL LPmKycK8fnuSS1sUYvd5xW3CWRk59tNAcfdOzC+R2YjvffDoK+BXtUXo0xx9KBj7Qdil SZRjs4Gn1pwQvnQOFRODmQaab1129xYkK9F8QaWBmG6wFPmajVyrFGyP9Rzga4hg2kPT qzYa5HZFaZLLZwfgoSho+m/sT+8q8zvT/Y7VIp6up+thr/gxFoCb0xeFshiyuBt+rckK gdmA== X-Gm-Message-State: AO0yUKUwY/DhIBY7J56IcpupMupVot6CuSYMidSwDGBHTMqeGQi/CYYC nlD/Tnv2k6IJwUmPyix1UAnES5Dzv2STY7cVnfE= X-Google-Smtp-Source: AK7set+PeboZbGEb2+zt/utkQg53ZGEYFCTScVWFgoCxmttwz5nJZ5QlPX3vbM1/iqBm7AqkUUwHVA== X-Received: by 2002:a05:6808:1649:b0:35e:d67e:3dcd with SMTP id az9-20020a056808164900b0035ed67e3dcdmr2473131oib.58.1674840531364; Fri, 27 Jan 2023 09:28:51 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:a00f:8f3d:7ba5:11f1]) by smtp.gmail.com with ESMTPSA id r131-20020acada89000000b0035aa617156bsm1803940oig.17.2023.01.27.09.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 09:28:49 -0800 (PST) To: libc-alpha@sourceware.org, "Andreas K . Huettel" , Paul Eggert , Florian Weimer Subject: [PATCH v5 3/5] linux: Add __readdir64_unlocked Date: Fri, 27 Jan 2023 14:28:32 -0300 Message-Id: <20230127172834.391311-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127172834.391311-1-adhemerval.zanella@linaro.org> References: <20230127172834.391311-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And use it on readdir_r implementation. Checked on i686-linux-gnu. --- include/dirent.h | 1 + sysdeps/unix/sysv/linux/readdir64.c | 20 +++++-- sysdeps/unix/sysv/linux/readdir64_r.c | 80 ++++++--------------------- 3 files changed, 33 insertions(+), 68 deletions(-) diff --git a/include/dirent.h b/include/dirent.h index 17827176ba..f391476298 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -21,6 +21,7 @@ extern DIR *__fdopendir (int __fd) attribute_hidden; extern int __closedir (DIR *__dirp) attribute_hidden; extern struct dirent *__readdir (DIR *__dirp) attribute_hidden; extern struct dirent *__readdir_unlocked (DIR *__dirp) attribute_hidden; +extern struct dirent64 *__readdir64_unlocked (DIR *__dirp) attribute_hidden; extern struct dirent64 *__readdir64 (DIR *__dirp); libc_hidden_proto (__readdir64) extern int __readdir_r (DIR *__dirp, struct dirent *__entry, diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c index db1c6214d8..2327511736 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c @@ -28,15 +28,11 @@ /* Read a directory entry from DIRP. */ struct dirent64 * -__readdir64 (DIR *dirp) +__readdir64_unlocked (DIR *dirp) { struct dirent64 *dp; int saved_errno = errno; -#if IS_IN (libc) - __libc_lock_lock (dirp->lock); -#endif - if (dirp->offset >= dirp->size) { /* We've emptied out our buffer. Refill it. */ @@ -68,6 +64,20 @@ __readdir64 (DIR *dirp) dirp->offset += dp->d_reclen; dirp->filepos = dp->d_off; + return dp; +} + +struct dirent64 * +__readdir64 (DIR *dirp) +{ + struct dirent64 *dp; + +#if IS_IN (libc) + __libc_lock_lock (dirp->lock); +#endif + + dp = __readdir64_unlocked (dirp); + #if IS_IN (libc) __libc_lock_unlock (dirp->lock); #endif diff --git a/sysdeps/unix/sysv/linux/readdir64_r.c b/sysdeps/unix/sysv/linux/readdir64_r.c index 285dc99509..5ae099bde7 100644 --- a/sysdeps/unix/sysv/linux/readdir64_r.c +++ b/sysdeps/unix/sysv/linux/readdir64_r.c @@ -32,89 +32,43 @@ __readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result) { struct dirent64 *dp; size_t reclen; - const int saved_errno = errno; - int ret; __libc_lock_lock (dirp->lock); - - do + while (1) { - if (dirp->offset >= dirp->size) - { - /* We've emptied out our buffer. Refill it. */ - - size_t maxread = dirp->allocation; - ssize_t bytes; - - maxread = dirp->allocation; - - bytes = __getdents64 (dirp->fd, dirp->data, maxread); - if (bytes <= 0) - { - /* On some systems getdents fails with ENOENT when the - open directory has been rmdir'd already. POSIX.1 - requires that we treat this condition like normal EOF. */ - if (bytes < 0 && errno == ENOENT) - { - bytes = 0; - __set_errno (saved_errno); - } - if (bytes < 0) - dirp->errcode = errno; - - dp = NULL; - break; - } - dirp->size = (size_t) bytes; - - /* Reset the offset into the buffer. */ - dirp->offset = 0; - } - - dp = (struct dirent64 *) &dirp->data[dirp->offset]; + dp = __readdir64_unlocked (dirp); + if (dp == NULL) + break; reclen = dp->d_reclen; + if (reclen <= offsetof (struct dirent64, d_name) + NAME_MAX + 1) + break; - dirp->offset += reclen; - - dirp->filepos = dp->d_off; - - if (reclen > offsetof (struct dirent64, d_name) + NAME_MAX + 1) + /* The record is very long. It could still fit into the caller-supplied + buffer if we can skip padding at the end. */ + size_t namelen = _D_EXACT_NAMLEN (dp); + if (namelen <= NAME_MAX) { - /* The record is very long. It could still fit into the - caller-supplied buffer if we can skip padding at the - end. */ - size_t namelen = _D_EXACT_NAMLEN (dp); - if (namelen <= NAME_MAX) - reclen = offsetof (struct dirent64, d_name) + namelen + 1; - else - { - /* The name is too long. Ignore this file. */ - dirp->errcode = ENAMETOOLONG; - dp->d_ino = 0; - continue; - } + reclen = offsetof (struct dirent64, d_name) + namelen + 1; + break; } - /* Skip deleted and ignored files. */ + /* The name is too long. Ignore this file. */ + dirp->errcode = ENAMETOOLONG; + dp->d_ino = 0; } - while (dp->d_ino == 0); if (dp != NULL) { *result = memcpy (entry, dp, reclen); entry->d_reclen = reclen; - ret = 0; } else - { - *result = NULL; - ret = dirp->errcode; - } + *result = NULL; __libc_lock_unlock (dirp->lock); - return ret; + return dp != NULL ? 0 : dirp->errcode; } From patchwork Fri Jan 27 17:28:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63812 X-Patchwork-Delegate: fweimer@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 94D1D38493D9 for ; Fri, 27 Jan 2023 17:30:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 94D1D38493D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674840634; bh=GkkpmIbZm2JW/8JRj1fY9PwKCBj6NHxkoGPv2H1+LkM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=L+q5mOpiG5msrCJTyKdjGF18QihXS7jjRXF74GmBgKM3hDnb4XN8DBaMLFEUUlA9W lXDKLEKdaEknQaLXv8TVsyiTNgrbfl/PXE2km2TLjs0wCQt5tVCq4a0RFejiZiQeL1 eF0zMcdYYVl1mEbb5uHWvBw5l8MtTYPBvzBDoJW8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 43B6C385B512 for ; Fri, 27 Jan 2023 17:28:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 43B6C385B512 Received: by mail-oi1-x22c.google.com with SMTP id i9so4745982oif.4 for ; Fri, 27 Jan 2023 09:28:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GkkpmIbZm2JW/8JRj1fY9PwKCBj6NHxkoGPv2H1+LkM=; b=gPQOwzDc+nuhXwkaTYIGF7LQE/h2Uw6MfNcAYN+AU84WMEBgvue8thUHXMoeyZH6bo 0oG/0Oxoa+EtaBC4gkEBC4caP2+hdn08PnTSytQ45lfAKRuRwJJjuXiFxmfnAoff9y9O GESL2E4EOyPkEnSzdDPi0lTDx/7GseaAAITzye0oLJUxKfe7RrrwHfHsH50GerPUPcFB 8YHn0JpMO/fAUweW3Cm/R21V7kuBedQlVfG45R53QNgr0/jP3GxQsd+i0xEuOOzdaCcl OyV0kaZVjvD4h1L2EPAq4AvsqC+hyJqCkyPpwwhw4UxsG5KTx/+8nkfUDM+i61PzyP91 Et3A== X-Gm-Message-State: AFqh2kpMn9OdnnoZzQKAf4iK89unmxUjnNbNiODpJrPlQSdkrnRWLdlI 9EnKVIRFpkCG73vZ2NdIknFNwL8UJpnGC7sm0Ig= X-Google-Smtp-Source: AMrXdXsNkgpUDemQJ9gMlmiohrLOAXW3RPTehGCXI8r4R9jS+euEox5aXLFEVH3tV7v8Wn/3hR/Myw== X-Received: by 2002:a05:6808:2092:b0:360:e954:9dda with SMTP id s18-20020a056808209200b00360e9549ddamr23881748oiw.12.1674840534429; Fri, 27 Jan 2023 09:28:54 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:a00f:8f3d:7ba5:11f1]) by smtp.gmail.com with ESMTPSA id r131-20020acada89000000b0035aa617156bsm1803940oig.17.2023.01.27.09.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 09:28:53 -0800 (PST) To: libc-alpha@sourceware.org, "Andreas K . Huettel" , Paul Eggert , Florian Weimer Subject: [PATCH v5 4/5] linux: Add __old_readdir64_unlocked Date: Fri, 27 Jan 2023 14:28:33 -0300 Message-Id: <20230127172834.391311-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127172834.391311-1-adhemerval.zanella@linaro.org> References: <20230127172834.391311-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And use it __old_readdir64_r. Checked on i686-linux-gnu. --- sysdeps/unix/sysv/linux/olddirent.h | 2 + sysdeps/unix/sysv/linux/readdir64.c | 24 +++++--- sysdeps/unix/sysv/linux/readdir64_r.c | 79 ++++++--------------------- 3 files changed, 35 insertions(+), 70 deletions(-) diff --git a/sysdeps/unix/sysv/linux/olddirent.h b/sysdeps/unix/sysv/linux/olddirent.h index 9789ffae07..cde95e192e 100644 --- a/sysdeps/unix/sysv/linux/olddirent.h +++ b/sysdeps/unix/sysv/linux/olddirent.h @@ -32,6 +32,8 @@ struct __old_dirent64 /* Now define the internal interfaces. */ extern struct __old_dirent64 *__old_readdir64 (DIR *__dirp); libc_hidden_proto (__old_readdir64); +extern struct __old_dirent64 *__old_readdir64_unlocked (DIR *__dirp) + attribute_hidden; extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry, struct __old_dirent64 **__result); extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes) diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c index 2327511736..b901071aa7 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c @@ -104,15 +104,11 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); attribute_compat_text_section struct __old_dirent64 * -__old_readdir64 (DIR *dirp) +__old_readdir64_unlocked (DIR *dirp) { struct __old_dirent64 *dp; int saved_errno = errno; -#if IS_IN (libc) - __libc_lock_lock (dirp->lock); -#endif - if (dirp->offset >= dirp->size) { /* We've emptied out our buffer. Refill it. */ @@ -129,9 +125,6 @@ __old_readdir64 (DIR *dirp) do not set errno in that case, to indicate success. */ if (bytes == 0 || errno == ENOENT) __set_errno (saved_errno); -#if IS_IN (libc) - __libc_lock_unlock (dirp->lock); -#endif return NULL; } dirp->size = (size_t) bytes; @@ -144,6 +137,21 @@ __old_readdir64 (DIR *dirp) dirp->offset += dp->d_reclen; dirp->filepos = dp->d_off; + return dp; +} + +attribute_compat_text_section +struct __old_dirent64 * +__old_readdir64 (DIR *dirp) +{ + struct __old_dirent64 *dp; + +#if IS_IN (libc) + __libc_lock_lock (dirp->lock); +#endif + + dp = __old_readdir64_unlocked (dirp); + #if IS_IN (libc) __libc_lock_unlock (dirp->lock); #endif diff --git a/sysdeps/unix/sysv/linux/readdir64_r.c b/sysdeps/unix/sysv/linux/readdir64_r.c index 5ae099bde7..b499388de7 100644 --- a/sysdeps/unix/sysv/linux/readdir64_r.c +++ b/sysdeps/unix/sysv/linux/readdir64_r.c @@ -91,89 +91,44 @@ __old_readdir64_r (DIR *dirp, struct __old_dirent64 *entry, { struct __old_dirent64 *dp; size_t reclen; - const int saved_errno = errno; - int ret; __libc_lock_lock (dirp->lock); - do + while (1) { - if (dirp->offset >= dirp->size) - { - /* We've emptied out our buffer. Refill it. */ - - size_t maxread = dirp->allocation; - ssize_t bytes; - - maxread = dirp->allocation; - - bytes = __old_getdents64 (dirp->fd, dirp->data, maxread); - if (bytes <= 0) - { - /* On some systems getdents fails with ENOENT when the - open directory has been rmdir'd already. POSIX.1 - requires that we treat this condition like normal EOF. */ - if (bytes < 0 && errno == ENOENT) - { - bytes = 0; - __set_errno (saved_errno); - } - if (bytes < 0) - dirp->errcode = errno; - - dp = NULL; - break; - } - dirp->size = (size_t) bytes; - - /* Reset the offset into the buffer. */ - dirp->offset = 0; - } - - dp = (struct __old_dirent64 *) &dirp->data[dirp->offset]; + dp = __old_readdir64_unlocked (dirp); + if (dp == NULL) + break; reclen = dp->d_reclen; + if (reclen <= offsetof (struct __old_dirent64, d_name) + NAME_MAX + 1) + break; - dirp->offset += reclen; - - dirp->filepos = dp->d_off; - - if (reclen > offsetof (struct __old_dirent64, d_name) + NAME_MAX + 1) + /* The record is very long. It could still fit into the caller-supplied + buffer if we can skip padding at the end. */ + size_t namelen = _D_EXACT_NAMLEN (dp); + if (namelen <= NAME_MAX) { - /* The record is very long. It could still fit into the - caller-supplied buffer if we can skip padding at the - end. */ - size_t namelen = _D_EXACT_NAMLEN (dp); - if (namelen <= NAME_MAX) - reclen = offsetof (struct __old_dirent64, d_name) + namelen + 1; - else - { - /* The name is too long. Ignore this file. */ - dirp->errcode = ENAMETOOLONG; - dp->d_ino = 0; - continue; - } + reclen = offsetof (struct dirent64, d_name) + namelen + 1; + break; } - /* Skip deleted and ignored files. */ + /* The name is too long. Ignore this file. */ + dirp->errcode = ENAMETOOLONG; + dp->d_ino = 0; } - while (dp->d_ino == 0); if (dp != NULL) { *result = memcpy (entry, dp, reclen); entry->d_reclen = reclen; - ret = 0; } else - { - *result = NULL; - ret = dirp->errcode; - } + *result = NULL; __libc_lock_unlock (dirp->lock); - return ret; + return dp != NULL ? 0 : dirp->errcode; } compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1); From patchwork Fri Jan 27 17:28:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 63810 X-Patchwork-Delegate: fweimer@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 046E038493D1 for ; Fri, 27 Jan 2023 17:29:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 046E038493D1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674840585; bh=+HiW7Hji/th5LkK9DfdLJZ2EmcsYhYd6joPXITKMzQo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=JHIEdleM0NrGYoQqSA4Ur1HutseSdrMAObFRYoEps0ar6orI+E2CM4N0RNjLe5kEe tbLfFZ07uaHKV8sCJWUzdNmuzfddipIesswEWpuKdGXuGShxEqqdexpgRpv/OQhRyn xFBswRGFPF2AID/NZkrtxJgzZ2/KIBhBeQYUQ1hk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by sourceware.org (Postfix) with ESMTPS id 4B32A3854178 for ; Fri, 27 Jan 2023 17:28:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B32A3854178 Received: by mail-oi1-x22c.google.com with SMTP id i5so4723165oih.11 for ; Fri, 27 Jan 2023 09:28:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+HiW7Hji/th5LkK9DfdLJZ2EmcsYhYd6joPXITKMzQo=; b=z06w/GqdlQAT3IXrmE/87aLAiku9m1TDeyX0KdJWZCkFf9VmoDBhYCW1KYfSKzrhW4 2VuwFPI/aSSRaJ+9+ECV+RkHq5ljSShLbgW8vOOhQWrs0nv2TLpG/hUQ9XjwLq4KMh03 X8OZRgH2/Tz3pZgpFrTsAKn0nEJlGBhGTkNfQTsA7JAWUC3TbrVNmu31I8+GC4U3cS98 IakhaRicOOOWKCCAGxLQiXeHTUDf4fLa1uAc0K9oG9H8N3/Sxk5xNxuDzJTVqDqpWL16 h2Ch4Pgxp8CImQGDWFP4oTDLaTduhs2k1PT6eEti/MmQgQV7t+Niq0Hd30mmYKi0CQq9 n01Q== X-Gm-Message-State: AO0yUKVQJrUhL6cjyuL/yzHexoSIwLPUMH2OyptNHgRl/nfwMrogn1B5 jjQt9xst8r4dnNPAN8C0XgCYKBGO0zx9/ETszJc= X-Google-Smtp-Source: AK7set+udfOhCaQsAMG0+mmfAnexQEqswJHGTchEQRDMKgXGsoVnCfewsCdTczXIvLQ3W4VtxoG+pw== X-Received: by 2002:a05:6808:b23:b0:36e:cfa6:f4c6 with SMTP id t3-20020a0568080b2300b0036ecfa6f4c6mr2704838oij.15.1674840537534; Fri, 27 Jan 2023 09:28:57 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:7e99:a00f:8f3d:7ba5:11f1]) by smtp.gmail.com with ESMTPSA id r131-20020acada89000000b0035aa617156bsm1803940oig.17.2023.01.27.09.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 09:28:56 -0800 (PST) To: libc-alpha@sourceware.org, "Andreas K . Huettel" , Paul Eggert , Florian Weimer Subject: [PATCH v5 5/5] linux: Use getdents64 on readdir64 compat implementation Date: Fri, 27 Jan 2023 14:28:34 -0300 Message-Id: <20230127172834.391311-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127172834.391311-1-adhemerval.zanella@linaro.org> References: <20230127172834.391311-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It uses a similar strategy from the non-LFS readdir that also uses getdents64 internally and uses a translation buffer to return the compat readdir64 entry. It allows to remove __old_getdents64. Checked on i686-linux-gnu. --- sysdeps/unix/sysv/linux/dirstream.h | 13 +++- sysdeps/unix/sysv/linux/getdents64.c | 93 ---------------------------- sysdeps/unix/sysv/linux/olddirent.h | 2 - sysdeps/unix/sysv/linux/readdir64.c | 50 +++++++++++---- 4 files changed, 50 insertions(+), 108 deletions(-) diff --git a/sysdeps/unix/sysv/linux/dirstream.h b/sysdeps/unix/sysv/linux/dirstream.h index 8f58a1c3a6..b03ece4590 100644 --- a/sysdeps/unix/sysv/linux/dirstream.h +++ b/sysdeps/unix/sysv/linux/dirstream.h @@ -24,6 +24,11 @@ #include #include +#include +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) +# include +#endif + /* Directory stream type. The miscellaneous Unix `readdir' implementations read directory data @@ -44,7 +49,13 @@ struct __dirstream int errcode; /* Delayed error code. */ #if !defined __OFF_T_MATCHES_OFF64_T || !defined __INO_T_MATCHES_INO64_T - struct dirent tdp; + union + { + struct dirent tdp; +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) + struct __old_dirent64 tdp64; +# endif + }; #endif #if _DIRENT_OFFSET_TRANSLATION struct dirstream_loc_t locs; /* off64_t to long int map for telldir. */ diff --git a/sysdeps/unix/sysv/linux/getdents64.c b/sysdeps/unix/sysv/linux/getdents64.c index 01c3517deb..db299864ed 100644 --- a/sysdeps/unix/sysv/linux/getdents64.c +++ b/sysdeps/unix/sysv/linux/getdents64.c @@ -36,97 +36,4 @@ weak_alias (__getdents64, getdents64) #if _DIRENT_MATCHES_DIRENT64 strong_alias (__getdents64, __getdents) -#else -# include - -# if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -# include -# include - -static ssize_t -handle_overflow (int fd, __off64_t offset, ssize_t count) -{ - /* If this is the first entry in the buffer, we can report the - error. */ - if (offset == 0) - { - __set_errno (EOVERFLOW); - return -1; - } - - /* Otherwise, seek to the overflowing entry, so that the next call - will report the error, and return the data read so far. */ - if (__lseek64 (fd, offset, SEEK_SET) != 0) - return -1; - return count; -} - -ssize_t -__old_getdents64 (int fd, char *buf, size_t nbytes) -{ - /* We do not move the individual directory entries. This is only - possible if the target type (struct __old_dirent64) is smaller - than the source type. */ - _Static_assert (offsetof (struct __old_dirent64, d_name) - <= offsetof (struct dirent64, d_name), - "__old_dirent64 is larger than dirent64"); - _Static_assert (__alignof__ (struct __old_dirent64) - <= __alignof__ (struct dirent64), - "alignment of __old_dirent64 is larger than dirent64"); - - ssize_t retval = INLINE_SYSCALL_CALL (getdents64, fd, buf, nbytes); - if (retval > 0) - { - /* This is the marker for the first entry. Offset 0 is reserved - for the first entry (see rewinddir). Here, we use it as a - marker for the first entry in the buffer. We never actually - seek to offset 0 because handle_overflow reports the error - directly, so it does not matter that the offset is incorrect - if entries have been read from the descriptor before (so that - the descriptor is not actually at offset 0). */ - __off64_t previous_offset = 0; - - char *p = buf; - char *end = buf + retval; - while (p < end) - { - struct dirent64 *source = (struct dirent64 *) p; - - /* Copy out the fixed-size data. */ - __ino_t ino = source->d_ino; - __off64_t offset = source->d_off; - unsigned int reclen = source->d_reclen; - unsigned char type = source->d_type; - - /* Check for ino_t overflow. */ - if (__glibc_unlikely (ino != source->d_ino)) - return handle_overflow (fd, previous_offset, p - buf); - - /* Convert to the target layout. Use a separate struct and - memcpy to side-step aliasing issues. */ - struct __old_dirent64 result; - result.d_ino = ino; - result.d_off = offset; - result.d_reclen = reclen; - result.d_type = type; - - /* Write the fixed-sized part of the result to the - buffer. */ - size_t result_name_offset = offsetof (struct __old_dirent64, d_name); - memcpy (p, &result, result_name_offset); - - /* Adjust the position of the name if necessary. Copy - everything until the end of the record, including the - terminating NUL byte. */ - if (result_name_offset != offsetof (struct dirent64, d_name)) - memmove (p + result_name_offset, source->d_name, - reclen - offsetof (struct dirent64, d_name)); - - p += reclen; - previous_offset = offset; - } - } - return retval; -} -# endif /* SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) */ #endif /* _DIRENT_MATCHES_DIRENT64 */ diff --git a/sysdeps/unix/sysv/linux/olddirent.h b/sysdeps/unix/sysv/linux/olddirent.h index cde95e192e..2d682a6919 100644 --- a/sysdeps/unix/sysv/linux/olddirent.h +++ b/sysdeps/unix/sysv/linux/olddirent.h @@ -36,8 +36,6 @@ extern struct __old_dirent64 *__old_readdir64_unlocked (DIR *__dirp) attribute_hidden; extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry, struct __old_dirent64 **__result); -extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes) - attribute_hidden; int __old_scandir64 (const char * __dir, struct __old_dirent64 *** __namelist, int (*__selector) (const struct __old_dirent64 *), diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c index b901071aa7..88e42c5e90 100644 --- a/sysdeps/unix/sysv/linux/readdir64.c +++ b/sysdeps/unix/sysv/linux/readdir64.c @@ -102,21 +102,43 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2); # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) # include +/* Translate the DP64 entry to the old LFS one in the translation buffer + at dirstream DS. Return true is the translation was possible or + false if either an internal fields can be represented in the non-LFS + entry or if the translation can not be resized. */ +static bool +dirstream_old_entry (struct __dirstream *ds, const struct dirent64 *dp64) +{ + /* Check for overflow. */ + if (!in_ino_t_range (dp64->d_ino)) + return false; + + /* And if name is too large. */ + if (dp64->d_reclen - offsetof (struct dirent64, d_name) > NAME_MAX) + return false; + + ds->filepos = dp64->d_off; + + ds->tdp64.d_off = dp64->d_off; + ds->tdp64.d_ino = dp64->d_ino; + ds->tdp64.d_reclen = dp64->d_reclen; + ds->tdp64.d_type = dp64->d_type; + memcpy (ds->tdp64.d_name, dp64->d_name, + dp64->d_reclen - offsetof (struct dirent64, d_name)); + + return true; +} + attribute_compat_text_section struct __old_dirent64 * __old_readdir64_unlocked (DIR *dirp) { - struct __old_dirent64 *dp; - int saved_errno = errno; + const int saved_errno = errno; if (dirp->offset >= dirp->size) { /* We've emptied out our buffer. Refill it. */ - - size_t maxread = dirp->allocation; - ssize_t bytes; - - bytes = __old_getdents64 (dirp->fd, dirp->data, maxread); + ssize_t bytes = __getdents64 (dirp->fd, dirp->data, dirp->allocation); if (bytes <= 0) { /* Linux may fail with ENOENT on some file systems if the @@ -127,17 +149,21 @@ __old_readdir64_unlocked (DIR *dirp) __set_errno (saved_errno); return NULL; } - dirp->size = (size_t) bytes; + dirp->size = bytes; /* Reset the offset into the buffer. */ dirp->offset = 0; } - dp = (struct __old_dirent64 *) &dirp->data[dirp->offset]; - dirp->offset += dp->d_reclen; - dirp->filepos = dp->d_off; + struct dirent64 *dp64 = (struct dirent64 *) &dirp->data[dirp->offset]; + dirp->offset += dp64->d_reclen; - return dp; + /* Skip entries which might overflow d_ino or for memory allocation failure + in case of large file names. */ + if (dirstream_old_entry (dirp, dp64)) + return &dirp->tdp64; + + return NULL; } attribute_compat_text_section