[glibc/azanella/clang] posix: Remove the __strcpy_chk from glob tests

Adhemerval Zanella azanella@sourceware.org
Thu Sep 28 17:58:55 GMT 2023


https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c1fa35997693da03bcef1b96682de2b76b1c2550

commit c1fa35997693da03bcef1b96682de2b76b1c2550
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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 <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <support/check.h>
 #include <support/test-driver.h>
 
 
@@ -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 })"


More information about the Glibc-cvs mailing list