From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bird.elm.relay.mailchannels.net (bird.elm.relay.mailchannels.net [23.83.212.17]) by sourceware.org (Postfix) with ESMTPS id E56D03858D1E for ; Wed, 14 Jun 2023 11:52:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E56D03858D1E 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 DB1441014FD; Wed, 14 Jun 2023 11:51:59 +0000 (UTC) Received: from pdx1-sub0-mail-a274.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 5CD22101D99; Wed, 14 Jun 2023 11:51:59 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1686743519; a=rsa-sha256; cv=none; b=uww826vybAqikudppGmoFg9CdiXaFHWhAB4CbJST7aelRrnJLDiMIJdtGziz5NOEN3TU7h Zn2cBosleRQhSeV3a6ltscEwRFC9dDq+pKjPU/KlIJPZsNYUpyC+w56oKFYod8NH5J6NRD IZ+s9SXWLvzjprjnhmXPDGQIEqFfA+7rkEgXYdP/iWzngKlso+x36hu+uq7BfnI8+DakP4 rX7r3ZTooJeOHlD6Tg9Ur/GdsdECVT7AUwlOfUkc3MpxaorFNUBRvuRJ0qU7fbM1Sz/smS jjFxuxSIavstEp/j1h/6wCtLcK9XDRsCdYsrRd/qUFq1v+t0Jwl2bZAIdzV9Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1686743519; 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=WIOcJZrZBOzlCesbjGZBXNZyjoW+8cE2aUoUCILsr6Y=; b=H0lvL+svUZ9gcK4/ZuFunPvx+lJOFYudtrzN1pPCE60qM4VS3D3PM02PPwhOlsCFcZjq36 zbfSLR13SCqesX7TSu44ThSDs7ngJ5ihRz1HWFX9bv1wjR/vI2fNS0FHoJ++7PCYAxKiHe ts1Uxrd/7c7gjkidaeWXXjhtFDTjPoU3De+zYga4Dt5SwEbJRbvcx0YDq4CZDqqH8xsMmr HVUueF8Sx+kR1MpRE5xx7Ti/ImgLC97rcM32hZLoa487CzB4Bu0hcr8aRHug/YlZAYD2Jf saIfgx25c3RKp1KQwS/fSDu0vnHULoC6DyuUvuWBSRu6Yu2aKfSi9L2tlXAphg== ARC-Authentication-Results: i=1; rspamd-6c69b8658d-pqp7c; 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-Little-Desert: 73fe9fdb1606b64e_1686743519671_722316305 X-MC-Loop-Signature: 1686743519671:2299847388 X-MC-Ingress-Time: 1686743519671 Received: from pdx1-sub0-mail-a274.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.116.217.201 (trex/6.9.1); Wed, 14 Jun 2023 11:51:59 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a274.dreamhost.com (Postfix) with ESMTPSA id 4Qh3gL514gz2S; Wed, 14 Jun 2023 04:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1686743518; bh=WIOcJZrZBOzlCesbjGZBXNZyjoW+8cE2aUoUCILsr6Y=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=QaEfufE4RiWfgesPinmhIdFTZz+Rngjk4y6PzAQDBksSk+7PAt4G7FB7qF2zvUyBe Ouy1sqvLoS6/q8KZhXbQmYUqa+T6wqb5Z4WjBfz/vKHAorjWURT2vK0kNiI/MxCdwE 5vPELoZld6N9gI5KMKe9qL7RF+b0dDAyIXyNZOMDRx1Qi7HB2HLEhu6Cm5p6u/JWjR 8P4pcEV7tP3nwwG51XwMHQNZLYGxPLN4KypzZ2dvdO4ZFxiJ9XhOXxITSmB6KCkPb/ +of6e+/51KD4+v1+8ySJ19/pzIEn1iqygN1T5mJtNVwyeQZTaEjI3MwObSrtQgTozD dryJid9R64W7Q== Message-ID: <746da72f-bec0-65c2-05ae-20eaca8a5f8d@gotplt.org> Date: Wed, 14 Jun 2023 07:51:57 -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 v8 1/2] tests: replace read by xread Content-Language: en-US To: =?UTF-8?B?RnLDqWTDqXJpYyBCw6lyYXQ=?= , libc-alpha@sourceware.org References: <20230614085207.232790-1-fberat@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20230614085207.232790-1-fberat@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3037.3 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_DNSWL_NONE,RCVD_IN_MSPIKE_H2,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-14 04:52, Frédéric Bérat wrote: > 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 > d0e3ffb7a58854248f1d5e737610d50cd0a60f46 the second call seems > superfluous. Hence, instead of checking for the return value of read, it > looks reasonable to simply remove it. > --- > Changes since v7: > - sysdeps/pthread/tst-cancel11.c directly uses read instead of xread to ensure > clarity on what is actually wanted. LGTM. Reviewed-by: Siddhesh Poyarekar > > 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 | 6 +++++- > sysdeps/pthread/tst-cancel20.c | 2 -- > sysdeps/pthread/tst-cancel21.c | 2 -- > sysdeps/pthread/tst-fini1mod.c | 4 +++- > 11 files changed, 56 insertions(+), 10 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 8ebe68aa95..5939e53469 100644 > --- a/support/Makefile > +++ b/support/Makefile > @@ -197,6 +197,7 @@ libsupport-routines = \ > xpthread_spin_lock \ > xpthread_spin_unlock \ > xraise \ > + xread \ > xreadlink \ > xrealloc \ > xrecvfrom \ > 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..19f76fcfeb > --- /dev/null > +++ b/support/xread.c > @@ -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 > + . */ > + > +#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..0fdc444154 100644 > --- a/sysdeps/pthread/tst-cancel11.c > +++ b/sysdeps/pthread/tst-cancel11.c > @@ -56,7 +56,11 @@ tf (void *arg) > > /* This call should block and be cancelable. */ > 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); > > diff --git a/sysdeps/pthread/tst-cancel20.c b/sysdeps/pthread/tst-cancel20.c > index 1d5c53049b..93f287aa4f 100644 > --- a/sysdeps/pthread/tst-cancel20.c > +++ b/sysdeps/pthread/tst-cancel20.c > @@ -84,8 +84,6 @@ tf_body (void) > exit (1); > } > > - read (fd[0], &c, 1); > - > pthread_cleanup_pop (0); > } > > diff --git a/sysdeps/pthread/tst-cancel21.c b/sysdeps/pthread/tst-cancel21.c > index bc4ff308f9..ec8bf0dba3 100644 > --- a/sysdeps/pthread/tst-cancel21.c > +++ b/sysdeps/pthread/tst-cancel21.c > @@ -85,8 +85,6 @@ tf_body (void) > exit (1); > } > > - read (fd[0], &c, 1); > - > 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);