From patchwork Thu Aug 26 12:22:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 44796 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 BA1383857C78 for ; Thu, 26 Aug 2021 12:23:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA1383857C78 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1629980584; bh=TA4iCjj/wxnPNf1Uq8SFchENxyx3sfy0WLAjAQiG3XA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=iRDs6IDS3r6Txuw57ucKWlpZdgaJ4HSQdJw8vlYNFEESEIQgN1G8i+zM7J4EDCpAg GE0XM3Qi0/bAi5hpck4npXxMML0aiWwb4ZvHUiRiepFkBRKJB7JYYZL0o8vIus29l9 4LahodFVUS0LEGChbm0VFl4/I0TzW7b3wFmpQw/0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by sourceware.org (Postfix) with ESMTPS id A8AD43858402 for ; Thu, 26 Aug 2021 12:22:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A8AD43858402 Received: by mail-qk1-x730.google.com with SMTP id f22so3056005qkm.5 for ; Thu, 26 Aug 2021 05:22:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TA4iCjj/wxnPNf1Uq8SFchENxyx3sfy0WLAjAQiG3XA=; b=GqEZ2yF2b2CrrF6ayf6DL49N2tTu/1OLDQHifojos2qlK4uv5DSWbJ20EkImBBNcVO L/aIXKO/yx8YQZKdmjYIQLaq3sl3pg7Ajybwd2ItIafhIlOQTxFOFcZvlk9N1dg3DlTy P6GdsWvRz4j9ieO28E5ig15pciccURatolRMpOZqo1MZXes4mRxbX3x0SkW2q4Hi0ARg DTWSX8ZbCr+FBY18O8A5XA2mEuqLyYH+foKkxiwQAaKk/Qjc4yD26LTtBRD1Y1FQOY8W OqarQYyTvbbCoX8G+ok66Ry8CMlvYNqrqoULj2MZy+eh7/qyYsqNjUL3fSwB0YMdjNRB /IpA== X-Gm-Message-State: AOAM532obDVYN/yzUO7A/Cu5l7vKyhpWE/0h/JTEcZO5+QZF7vNJwaAH wCgHQUhXPnQMeKWWSxA1QmzW5sQ40Vw80w== X-Google-Smtp-Source: ABdhPJwPVhF+JSffzs88y1obUWlumWMfxllLNMaRRh3UTLtSxbee2olXJrWDTn3vwI61ipClkwpdCw== X-Received: by 2002:a05:620a:3ce:: with SMTP id r14mr3313734qkm.228.1629980553803; Thu, 26 Aug 2021 05:22:33 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:1a68:4988:5e6e:21a3:3c6b]) by smtp.gmail.com with ESMTPSA id j3sm1820724qti.4.2021.08.26.05.22.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 05:22:33 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3] io: Fix ftw internal realloc buffer (BZ #28126) Date: Thu, 26 Aug 2021 09:22:30 -0300 Message-Id: <20210826122230.3772402-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" Third time's a charm... D.J note that buildbot accused a failure [1] where mkdir failed to create the directory. I am not sure how this happened, I couldn't reproduce it on ext4 FS neither on tmpfs. [1] https://www.delorie.com/trybots/32bit/2720/io-tst-ftw-bz28126.out --- The 106ff08526d3ca did not take in consideration the buffer might be reallocated if the total path is larger than PATH_MAX. The realloc uses 'dirbuf', where 'dirstreams' is the allocated buffer. Checked on x86_64-linux-gnu. --- io/Makefile | 1 + io/ftw.c | 13 +++++--- io/tst-ftw-bz28126.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 io/tst-ftw-bz28126.c diff --git a/io/Makefile b/io/Makefile index 9871ecbc74..ecf65aba60 100644 --- a/io/Makefile +++ b/io/Makefile @@ -79,6 +79,7 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ tst-futimens \ tst-utimensat \ tst-closefrom \ + tst-ftw-bz28126 tests-time64 := \ tst-futimens-time64 \ diff --git a/io/ftw.c b/io/ftw.c index ce1c6a14a3..bb3ac0a7e0 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -392,13 +392,16 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, if (data->dirbufsize < new_buflen) { /* Enlarge the buffer. */ - char *newp; - - data->dirbufsize = 2 * new_buflen; - newp = (char *) realloc (data->dirbuf, data->dirbufsize); + size_t newsize = 2 * new_buflen; + void *newp = realloc (data->dirstreams, data->maxdir + * sizeof (struct dir_data *) + + newsize); if (newp == NULL) return -1; - data->dirbuf = newp; + data->dirstreams = newp; + data->dirbufsize = newsize; + data->dirbuf = (char *) data->dirstreams + + data->maxdir * sizeof (struct dir_data *); } *((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0'; diff --git a/io/tst-ftw-bz28126.c b/io/tst-ftw-bz28126.c new file mode 100644 index 0000000000..ecebe1e7c0 --- /dev/null +++ b/io/tst-ftw-bz28126.c @@ -0,0 +1,79 @@ +/* Check if internal buffer reallocation work for large paths (BZ #28126) + Copyright (C) 2021 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 + +static int +my_func (const char *file, const struct stat *sb, int flag) +{ + return 0; +} + +static const char folder[NAME_MAX] = { [0 ... 253] = 'a', [254] = '\0' }; + +#define NSUBFOLDERS 16 + +static void +do_cleanup (void) +{ + xchdir (".."); + for (int i = 0; i < NSUBFOLDERS - 1; i++) + { + remove (folder); + xchdir (".."); + } + remove (folder); +} +#define CLEANUP_HANDLER do_cleanup + +/* Check whether stack overflow occurs. */ +static int +do_test (void) +{ + char *tempdir = support_create_temp_directory ("tst-bz28126"); + + /* Create path with various subfolders to force an internal buffer + reallocation within ntfw. */ + char *path = xasprintf ("%s/%s", tempdir, folder); + xmkdir (path, 0777); + xchdir (path); + free (path); + for (int i = 0; i < NSUBFOLDERS - 1; i++) + { + xmkdir (folder, 0777); + xchdir (folder); + } + + TEST_COMPARE (ftw (tempdir, my_func, 20), 0); + + free (tempdir); + + do_cleanup (); + + return 0; +} + +#include