From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 5DDE73856DE8 for ; Thu, 23 Jun 2022 09:00:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5DDE73856DE8 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 69BE221DE6; Thu, 23 Jun 2022 09:00:08 +0000 (UTC) Received: from hawking.suse.de (unknown [10.168.4.11]) by relay2.suse.de (Postfix) with ESMTP id B87032C142; Thu, 23 Jun 2022 09:00:02 +0000 (UTC) Received: by hawking.suse.de (Postfix, from userid 17005) id 34046444B9A; Thu, 23 Jun 2022 11:00:08 +0200 (CEST) From: Andreas Schwab To: Adhemerval Zanella Cc: libc-alpha@sourceware.org Subject: [PATCH] debug: test for more required cacellation points (bug 29274) References: <9228DE08-1006-4432-BAB7-E44BBB0ECF11@linaro.org> X-Yow: The SAME WAVE keeps coming in and COLLAPSING like a rayon MUU-MUU.. Date: Thu, 23 Jun 2022 11:00:08 +0200 In-Reply-To: <9228DE08-1006-4432-BAB7-E44BBB0ECF11@linaro.org> (Adhemerval Zanella's message of "Wed, 22 Jun 2022 13:54:45 -0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2022 09:00:12 -0000 Generalize the test for cancellation point in __read_chk to also test the other fortified functions with required cancellation points. --- debug/Makefile | 6 +- debug/tst-chk-cancel.c | 108 ++++++++++++++++++++++++++++++++++++ debug/tst-read-chk-cancel.c | 50 ----------------- 3 files changed, 111 insertions(+), 53 deletions(-) create mode 100644 debug/tst-chk-cancel.c delete mode 100644 debug/tst-read-chk-cancel.c diff --git a/debug/Makefile b/debug/Makefile index 456b349c4d..99cdf3221b 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -110,7 +110,7 @@ CPPFLAGS-tst-longjmp_chk2.c += -D_FORTIFY_SOURCE=1 CFLAGS-tst-longjmp_chk3.c += -fexceptions -fasynchronous-unwind-tables CPPFLAGS-tst-longjmp_chk3.c += -D_FORTIFY_SOURCE=1 CPPFLAGS-tst-realpath-chk.c += -D_FORTIFY_SOURCE=2 -CPPFLAGS-tst-read-chk-cancel.c += -D_FORTIFY_SOURCE=2 +CPPFLAGS-tst-chk-cancel.c += -D_FORTIFY_SOURCE=2 # _FORTIFY_SOURCE tests. # Auto-generate tests for _FORTIFY_SOURCE for different levels, compilers and @@ -206,7 +206,7 @@ tests += tst-ssp-1 endif ifeq ($(have-thread-library), yes) -tests += tst-read-chk-cancel +tests += tst-chk-cancel endif ifeq (,$(CXX)) @@ -248,4 +248,4 @@ $(objpfx)xtrace: xtrace.sh -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ && rm -f $@ && mv $@.new $@ && chmod +x $@ -$(objpfx)tst-read-chk-cancel: $(shared-thread-library) +$(objpfx)tst-chk-cancel: $(shared-thread-library) diff --git a/debug/tst-chk-cancel.c b/debug/tst-chk-cancel.c new file mode 100644 index 0000000000..dec85ef067 --- /dev/null +++ b/debug/tst-chk-cancel.c @@ -0,0 +1,108 @@ +/* Test for required cancellation points in fortified functions (BZ #29274) + Copyright (C) 2022 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 +#include +#include + +static int pipe_fds[2]; +static pthread_barrier_t barrier; + +static void * +read_thread (void *n) +{ + xpthread_barrier_wait (&barrier); + char c; + /* This call should be forwarded to __read_chk because the buffer size + is known, but the read length is non-constant. */ + if (read (pipe_fds[0], &c, (uintptr_t) n) != 1) + return (void *) -1L; + return 0; +} + +static void * +pread_thread (void *n) +{ + xpthread_barrier_wait (&barrier); + char c; + /* This call should be forwarded to __pread_chk because the buffer size + is known, but the read length is non-constant. */ + if (pread (pipe_fds[0], &c, (uintptr_t) n, 0) != 1) + return (void *) -1L; + return 0; +} + +static void * +pread64_thread (void *n) +{ + xpthread_barrier_wait (&barrier); + char c; + /* This call should be forwarded to __pread64_chk because the buffer size + is known, but the read length is non-constant. */ + if (pread64 (pipe_fds[0], &c, (uintptr_t) n, 0) != 1) + return (void *) -1L; + return 0; +} + +static void * +poll_thread (void *n) +{ + xpthread_barrier_wait (&barrier); + struct pollfd pfd = { pipe_fds[0], POLLIN, 0 }; + /* This call should be forwarded to __poll_chk because the pollfd size + is known, but the number of entries is non-constant. */ + if (poll (&pfd, (uintptr_t) n, -1) != 1) + return (void *) -1L; + return 0; +} + +static void * +ppoll_thread (void *n) +{ + xpthread_barrier_wait (&barrier); + struct pollfd pfd = { pipe_fds[0], POLLIN, 0 }; + /* This call should be forwarded to __ppoll_chk because the pollfd size + is known, but the number of entries is non-constant. */ + if (ppoll (&pfd, (uintptr_t) n, 0, 0) != 1) + return (void *) -1L; + return 0; +} + +static void *(*thread_fct[]) (void *) = + { + read_thread, pread_thread, pread64_thread, poll_thread, ppoll_thread + }; + +static int +do_test (void) +{ + xpthread_barrier_init (&barrier, 0, 2); + xpipe (pipe_fds); + for (int i = 0; i < sizeof (thread_fct) / sizeof (thread_fct[0]); i++) + { + pthread_t thr = xpthread_create (0, thread_fct[i], (void *) 1L); + xpthread_barrier_wait (&barrier); + xpthread_cancel (thr); + xpthread_join (thr); + } + xpthread_barrier_destroy (&barrier); + return 0; +} + +#include diff --git a/debug/tst-read-chk-cancel.c b/debug/tst-read-chk-cancel.c deleted file mode 100644 index 7e06afb596..0000000000 --- a/debug/tst-read-chk-cancel.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Test that __read_chk is a cancellation point (BZ #29274) - Copyright (C) 2022 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 -#include - -static int pipe_fds[2]; -static pthread_barrier_t barrier; - -static void * -read_thread (void *n) -{ - xpthread_barrier_wait (&barrier); - char c; - /* This call should be forwarded to __read_chk because the buffer size - is known, but the read length is non-constant. */ - if (read (pipe_fds[0], &c, (uintptr_t) n) != 1) - return (void *) -1L; - return 0; -} - -static int -do_test (void) -{ - xpthread_barrier_init (&barrier, 0, 2); - xpipe (pipe_fds); - pthread_t thr = xpthread_create (0, read_thread, (void *) 1L); - xpthread_barrier_wait (&barrier); - xpthread_cancel (thr); - xpthread_join (thr); - return 0; -} - -#include -- 2.35.3 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."