tests: replace read by xread

With fortification enabled, read calls return result needs to be checked,
has it gets the __wur macro enabled.

Note on read call removal from  sysdeps/pthread/tst-cancel20.c and
sysdeps/pthread/tst-cancel21.c:
It is assumed that this second read call was there to overcome the race
condition between pipe closure and thread cancellation that could happen
in the original code. Since this race condition got fixed by
d0e3ffb7a5 the second call seems
superfluous. Hence, instead of checking for the return value of read, it
looks reasonable to simply remove it.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Frédéric Bérat 2023-06-14 10:52:06 +02:00 committed by Siddhesh Poyarekar
parent cf30aa43a5
commit 20b6b8e8a5
11 changed files with 56 additions and 10 deletions

View File

@ -45,7 +45,8 @@ do_test (void)
} }
char buf[5]; char buf[5];
read(fd, buf, sizeof (buf)); xread(fd, buf, sizeof (buf));
close(fd); close(fd);
struct stat64 st2; struct stat64 st2;

View File

@ -21,6 +21,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <support/xunistd.h>
/* LinuxThreads pthread_cleanup_{push,pop} helpers. */ /* LinuxThreads pthread_cleanup_{push,pop} helpers. */
extern void _pthread_cleanup_push (struct _pthread_cleanup_buffer *__buffer, extern void _pthread_cleanup_push (struct _pthread_cleanup_buffer *__buffer,
void (*__routine) (void *), void (*__routine) (void *),
@ -64,7 +66,7 @@ fn_read (void)
} }
char c; char c;
read (fds[0], &c, 1); xread (fds[0], &c, 1);
} }

View File

@ -197,6 +197,7 @@ libsupport-routines = \
xpthread_spin_lock \ xpthread_spin_lock \
xpthread_spin_unlock \ xpthread_spin_unlock \
xraise \ xraise \
xread \
xreadlink \ xreadlink \
xrealloc \ xrealloc \
xrecvfrom \ xrecvfrom \

View File

@ -1217,7 +1217,8 @@ main (int argc, char **argv)
/* Get our "outside" pid from our parent. We use this to help with /* Get our "outside" pid from our parent. We use this to help with
debugging from outside the container. */ debugging from outside the container. */
read (pipes[0], &child, sizeof(child)); xread (pipes[0], &child, sizeof(child));
close (pipes[0]); close (pipes[0]);
close (pipes[1]); close (pipes[1]);
sprintf (pid_buf, "%lu", (long unsigned)child); sprintf (pid_buf, "%lu", (long unsigned)child);

36
support/xread.c Normal file
View File

@ -0,0 +1,36 @@
/* read with error checking and retries.
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
<https://www.gnu.org/licenses/>. */
#include <support/xunistd.h>
#include <support/check.h>
void
xread (int fd, void *buffer, size_t length)
{
char *p = buffer;
char *end = p + length;
while (p < end)
{
ssize_t ret = read (fd, p, end - p);
if (ret < 0)
FAIL_EXIT1 ("read of %zu bytes failed after %td: %m",
length, p - (char *) buffer);
p += ret;
}
}

View File

@ -77,6 +77,9 @@ void xclose (int);
/* Write the buffer. Retry on short writes. */ /* Write the buffer. Retry on short writes. */
void xwrite (int, const void *, size_t); void xwrite (int, const void *, size_t);
/* Read to buffer. Retry on short reads. */
void xread (int, void *, size_t);
/* Invoke mmap with a zero file offset. */ /* Invoke mmap with a zero file offset. */
void *xmmap (void *addr, size_t length, int prot, int flags, int fd); void *xmmap (void *addr, size_t length, int prot, int flags, int fd);
void xmprotect (void *addr, size_t length, int prot); void xmprotect (void *addr, size_t length, int prot);

View File

@ -464,7 +464,7 @@ $(objpfx)tst-cancel28: $(librt)
$(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so $(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so
$(objpfx)tst-fini1mod.so: $(shared-thread-library) $(objpfx)tst-fini1mod.so: $(libsupport) $(shared-thread-library)
$(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so
LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so

View File

@ -56,7 +56,11 @@ tf (void *arg)
/* This call should block and be cancelable. */ /* This call should block and be cancelable. */
char buf[20]; char buf[20];
read (fd[0], buf, sizeof (buf)); if (read (fd[0], buf, sizeof (buf)))
{
puts ("read unexpectedly returned");
exit (1);
}
pthread_cleanup_pop (0); pthread_cleanup_pop (0);

View File

@ -84,8 +84,6 @@ tf_body (void)
exit (1); exit (1);
} }
read (fd[0], &c, 1);
pthread_cleanup_pop (0); pthread_cleanup_pop (0);
} }

View File

@ -85,8 +85,6 @@ tf_body (void)
exit (1); exit (1);
} }
read (fd[0], &c, 1);
pthread_cleanup_pop (0); pthread_cleanup_pop (0);
} }

View File

@ -20,6 +20,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <support/xunistd.h>
static void * static void *
tf (void *arg) tf (void *arg)
@ -32,7 +34,7 @@ tf (void *arg)
} }
char buf[10]; char buf[10];
read (fds[0], buf, sizeof (buf)); xread (fds[0], buf, sizeof (buf));
puts ("read returned"); puts ("read returned");
exit (1); exit (1);