From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 16F32386D60A; Thu, 21 Dec 2023 19:00:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16F32386D60A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1703185247; bh=zLYwRvqg0XS6vOFbG0Np55Y9/xRG15NmE31quRBblAc=; h=From:To:Subject:Date:From; b=RifbIFHefqjp1BjxQx/z/DYOK5CXo4Fh6Ki9XlUcBP8GoaWell/sKCQVbxZg10Ily bfRZ8FvhdjmGsG44rgpeo50vTuGY+X/AtkaxofoFIQsoiDuz6Fo+vL9ZKExfLczrtX 3A/0fB2oHojTgPRfO4tsUGBvVb+SGlq1w+nPbaMo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] posix: Remove the __strcpy_chk from glob tests X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 8abac0b9f79f5585b3a24816843fec9334620477 X-Git-Newrev: e8f7029902f2b98931db14607540be672b87fe5c Message-Id: <20231221190047.16F32386D60A@sourceware.org> Date: Thu, 21 Dec 2023 19:00:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e8f7029902f2b98931db14607540be672b87fe5c commit e8f7029902f2b98931db14607540be672b87fe5c Author: Adhemerval Zanella Date: Wed Aug 30 09:00:04 2023 -0300 posix: Remove the __strcpy_chk from glob tests Not all compiler supports the builtin. Diff: --- posix/tst-glob_lstat_compat.c | 8 +++++++- posix/tst-gnuglob-skeleton.c | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c index 6559954247..9e6f9b2c36 100644 --- a/posix/tst-glob_lstat_compat.c +++ b/posix/tst-glob_lstat_compat.c @@ -173,7 +173,13 @@ my_readdir (void *gdir) dir->d.d_type = filesystem[dir->idx].type; - __strcpy_chk (dir->d.d_name, filesystem[dir->idx].name, NAME_MAX); + { + size_t len = strlen (filesystem[dir->idx].name); + if (len >= NAME_MAX) + FAIL_EXIT1 ("[%s] entry name larger than NAME_MAX (%d)", __func__, + NAME_MAX); + memcpy (dir->d.d_name, filesystem[dir->idx].name, len + 1); + } ++dir->idx; diff --git a/posix/tst-gnuglob-skeleton.c b/posix/tst-gnuglob-skeleton.c index 998fc2d94d..f8888c388c 100644 --- a/posix/tst-gnuglob-skeleton.c +++ b/posix/tst-gnuglob-skeleton.c @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -222,7 +223,13 @@ my_readdir (void *gdir) dir->d.d_type = filesystem[dir->idx].type; - __strcpy_chk (dir->d.d_name, filesystem[dir->idx].name, NAME_MAX); + { + size_t len = strlen (filesystem[dir->idx].name); + if (len >= NAME_MAX) + FAIL_EXIT1 ("[%s] entry name larger than NAME_MAX (%d)", __func__, + NAME_MAX); + memcpy (dir->d.d_name, filesystem[dir->idx].name, len + 1); + } if (test_verbose > 0) printf ("info: my_readdir ({ level: %d, idx: %ld })"