From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from antelope.elm.relay.mailchannels.net (antelope.elm.relay.mailchannels.net [23.83.212.4]) by sourceware.org (Postfix) with ESMTPS id 47D96385841A for ; Tue, 6 Jun 2023 06:21:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 47D96385841A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id EE0905C1EF1; Tue, 6 Jun 2023 06:21:45 +0000 (UTC) Received: from pdx1-sub0-mail-a283.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 8394B5C25A7; Tue, 6 Jun 2023 06:21:45 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1686032505; a=rsa-sha256; cv=none; b=vXtlozumVBJRO9wzkSZO0r8Gfkyf3l1Qnbm4oDM6jmlQFV5N3MJWpH700DiJdGVGGp0adi queutNuse+p6nuzDSUAuB/bADUDkj2A/Qmx3hfyZ5sSrT9MipT3rj8sRozttEeNCoDSJ+j bue70VupPzKITndaiN7gwYZ4OgUPYuAvbNvPGC6uGCBdMuL5M/64hh9PH/XBZdqAOMQW6N 9nnkxTnmQM2ysmlti7Oy5hIg//KIhvfj/+cpqa3MUveA6DJAopGHoRq6hsBRPiK0p2+SNE To/KoJd8JneH+kYScJp23GuVn+bio+yvUAHT6lmQoPC+WRrPHH23ebcFl3yu4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1686032505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kAg/R0GwOEkPFSI+qu551UrHFvScvY9f/xe8IsSIWiM=; b=WxWztQeh6smgEb/1Iu07PAFp3zaXLiJXf0hChN2HGF8nhkRLzASjOGlvlqHfxNChoyDJvx iwt2fiZMl/rbWODqnLb8ysreqE/koCfFjaDwFqcvXa9gSLmsYt+rdZGx1YZ7kB8jYpdO9T itHT/XuaZMsel/nAMEJFkhDcOdkkiaWYCHS94Ede8bYpscmcOSDd4YiTKKXG6G7l0BVwTO dR2KbSKZ5wvdVunsfk3boYXeF/LH6cUekn4fp4DbdHZFBw1QAxvo62uqyOpUPdA3NU1XE0 zk7jV/ZmTwlkI7vzEFqJfAZgjEkAGQ/ocPVsaHgL2E1NvzRE2dhPdI1PmOpJ7w== ARC-Authentication-Results: i=1; rspamd-5f966895c-qqbg2; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Spicy-Supply: 7a1ac884693e7d51_1686032505791_2895914521 X-MC-Loop-Signature: 1686032505791:2308608487 X-MC-Ingress-Time: 1686032505791 Received: from pdx1-sub0-mail-a283.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.97.48.122 (trex/6.8.1); Tue, 06 Jun 2023 06:21:45 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-02-142-113-138-85.dsl.bell.ca [142.113.138.85]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a283.dreamhost.com (Postfix) with ESMTPSA id 4Qb0k11BvmzB4; Mon, 5 Jun 2023 23:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1686032505; bh=kAg/R0GwOEkPFSI+qu551UrHFvScvY9f/xe8IsSIWiM=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=nisMQlC1sUfr83Gtg8dDy4knsH2BxILIgLYo2dzErDNI445V0ucqKxDgQy8Gc5+J/ iXOHRSCT3CZUVo17EXdebvqAWnz8ncuOql+9fDZ3ws5KmhC7Lg5PQcutwpsO4qbQIi FbDBZAAYi3uKnbyUTo7O18tLF68L0fb0luGu+R7PDkC00tdp97kprHugh+q8dqmbD/ /dgfZ316zAyjPsp0xwLdVLRWqnK9xL2VriBgqNY/t2c8V9QQFGxoh0fiYzeUmgjkse GrfhiB2bGfLTswC+CPQW88X/W1w2RpUNxYlbWowLAGGPZ+iN5teuP9LEF7Fn6mHkJc SHEDuIWSSmuBQ== Message-ID: Date: Tue, 6 Jun 2023 02:21:43 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v6 2/7] tests: replace read by xread Content-Language: en-US To: =?UTF-8?B?RnLDqWTDqXJpYyBCw6lyYXQ=?= , libc-alpha@sourceware.org References: <20230602152812.108497-1-fberat@redhat.com> <20230602152812.108497-3-fberat@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20230602152812.108497-3-fberat@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3035.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_BL_SPAMCOP_NET,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2023-06-02 11:28, Frédéric Bérat wrote: > With fortification enabled, read calls return result needs to be checked, > has it gets the __wur macro enabled. > --- > Changes since v4/v5: > - Rebased > > dirent/tst-fdopendir.c | 3 ++- > nptl/tst-cleanup4.c | 4 +++- > support/Makefile | 1 + > support/test-container.c | 3 ++- > support/xread.c | 36 ++++++++++++++++++++++++++++++++++ > support/xunistd.h | 3 +++ > sysdeps/pthread/Makefile | 2 +- > sysdeps/pthread/tst-cancel11.c | 4 +++- > sysdeps/pthread/tst-cancel20.c | 10 +++------- > sysdeps/pthread/tst-cancel21.c | 9 ++------- > sysdeps/pthread/tst-fini1mod.c | 4 +++- > 11 files changed, 59 insertions(+), 20 deletions(-) > create mode 100644 support/xread.c > > diff --git a/dirent/tst-fdopendir.c b/dirent/tst-fdopendir.c > index 2c9520574d..d6a24f47db 100644 > --- a/dirent/tst-fdopendir.c > +++ b/dirent/tst-fdopendir.c > @@ -45,7 +45,8 @@ do_test (void) > } > > char buf[5]; > - read(fd, buf, sizeof (buf)); > + xread(fd, buf, sizeof (buf)); > + > close(fd); > > struct stat64 st2; > diff --git a/nptl/tst-cleanup4.c b/nptl/tst-cleanup4.c > index 1d3d53fb5f..f2e9f263e5 100644 > --- a/nptl/tst-cleanup4.c > +++ b/nptl/tst-cleanup4.c > @@ -21,6 +21,8 @@ > #include > #include > > +#include > + > /* LinuxThreads pthread_cleanup_{push,pop} helpers. */ > extern void _pthread_cleanup_push (struct _pthread_cleanup_buffer *__buffer, > void (*__routine) (void *), > @@ -64,7 +66,7 @@ fn_read (void) > } > > char c; > - read (fds[0], &c, 1); > + xread (fds[0], &c, 1); > } > > > diff --git a/support/Makefile b/support/Makefile > index 130de4a985..e39001ef24 100644 > --- a/support/Makefile > +++ b/support/Makefile > @@ -196,6 +196,7 @@ libsupport-routines = \ > xpthread_spin_unlock \ > xraise \ > xreadlink \ > + xread \ > xrealloc \ > xrecvfrom \ > xsendto \ > diff --git a/support/test-container.c b/support/test-container.c > index 20ea19af37..788b091ea0 100644 > --- a/support/test-container.c > +++ b/support/test-container.c > @@ -1217,7 +1217,8 @@ main (int argc, char **argv) > > /* Get our "outside" pid from our parent. We use this to help with > debugging from outside the container. */ > - read (pipes[0], &child, sizeof(child)); > + xread (pipes[0], &child, sizeof(child)); > + > close (pipes[0]); > close (pipes[1]); > sprintf (pid_buf, "%lu", (long unsigned)child); > diff --git a/support/xread.c b/support/xread.c > new file mode 100644 > index 0000000000..215f9b4f00 > --- /dev/null > +++ b/support/xread.c > @@ -0,0 +1,36 @@ > +/* read with error checking and retries. > + Copyright (C) 2016-2023 Free Software Foundation, Inc. Only 2023. > + 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 > + > +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; > + } > +} > diff --git a/support/xunistd.h b/support/xunistd.h > index 43a1e69fcb..0aa2638a8d 100644 > --- a/support/xunistd.h > +++ b/support/xunistd.h > @@ -77,6 +77,9 @@ void xclose (int); > /* Write the buffer. Retry on short writes. */ > 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. */ > void *xmmap (void *addr, size_t length, int prot, int flags, int fd); > void xmprotect (void *addr, size_t length, int prot); > diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile > index 5df1109dd3..32cf4eb119 100644 > --- a/sysdeps/pthread/Makefile > +++ b/sysdeps/pthread/Makefile > @@ -464,7 +464,7 @@ $(objpfx)tst-cancel28: $(librt) > > $(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 > LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so > diff --git a/sysdeps/pthread/tst-cancel11.c b/sysdeps/pthread/tst-cancel11.c > index 4dd84d6673..449f3b9b63 100644 > --- a/sysdeps/pthread/tst-cancel11.c > +++ b/sysdeps/pthread/tst-cancel11.c > @@ -22,6 +22,8 @@ > #include > #include > > +#include > + > > static pthread_barrier_t bar; > static int fd[2]; > @@ -56,7 +58,7 @@ tf (void *arg) > > /* This call should block and be cancelable. */ > char buf[20]; > - read (fd[0], buf, sizeof (buf)); > + xread (fd[0], buf, sizeof (buf)); > > pthread_cleanup_pop (0); > > diff --git a/sysdeps/pthread/tst-cancel20.c b/sysdeps/pthread/tst-cancel20.c > index 1d5c53049b..0f1ada3742 100644 > --- a/sysdeps/pthread/tst-cancel20.c > +++ b/sysdeps/pthread/tst-cancel20.c > @@ -22,6 +22,8 @@ > #include > #include > > +#include > + > > static int fd[4]; > static pthread_barrier_t b; > @@ -43,11 +45,7 @@ sh_body (void) > pthread_cleanup_push (cl, (void *) 1L); > > in_sh_body = 1; > - if (read (fd[2], &c, 1) == 1) > - { > - puts ("read succeeded"); > - exit (1); > - } > + xread (fd[2], &c, 1); Uhmm, isn't read success a failure here? > > pthread_cleanup_pop (0); > } > @@ -84,8 +82,6 @@ tf_body (void) > exit (1); > } > > - read (fd[0], &c, 1); > - No replacement for this read call? > pthread_cleanup_pop (0); > } > > diff --git a/sysdeps/pthread/tst-cancel21.c b/sysdeps/pthread/tst-cancel21.c > index bc4ff308f9..c14ed37d14 100644 > --- a/sysdeps/pthread/tst-cancel21.c > +++ b/sysdeps/pthread/tst-cancel21.c > @@ -23,6 +23,7 @@ > #include > #include > > +#include > > static int fd[4]; > static pthread_barrier_t b; > @@ -44,11 +45,7 @@ sh_body (void) > pthread_cleanup_push (cl, (void *) 1L); > > in_sh_body = 1; > - if (read (fd[2], &c, 1) == 1) > - { > - puts ("read succeeded"); > - exit (1); > - } > + xread (fd[2], &c, 1); Likewise, read success should be a failure? > > pthread_cleanup_pop (0); > } > @@ -85,8 +82,6 @@ tf_body (void) > exit (1); > } > > - read (fd[0], &c, 1); > - Missing xread replacement. > pthread_cleanup_pop (0); > } > > diff --git a/sysdeps/pthread/tst-fini1mod.c b/sysdeps/pthread/tst-fini1mod.c > index cdadf034cd..0a45f6c5f2 100644 > --- a/sysdeps/pthread/tst-fini1mod.c > +++ b/sysdeps/pthread/tst-fini1mod.c > @@ -20,6 +20,8 @@ > #include > #include > > +#include > + > > static void * > tf (void *arg) > @@ -32,7 +34,7 @@ tf (void *arg) > } > > char buf[10]; > - read (fds[0], buf, sizeof (buf)); > + xread (fds[0], buf, sizeof (buf)); > > puts ("read returned"); > exit (1);