From patchwork Mon Jun 27 20:37:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 55457 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6E78B383879D for ; Mon, 27 Jun 2022 20:38:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6E78B383879D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1656362295; bh=7QsivbgVbEZxH3nZEhHlh5Lw11hX6WtUNpyDMHSfJpw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=gZUG5vyCChCi8A1pHzg+MWWbr/bAsnVVcv89TKC5N27ITEOdGyK4EZN6sx6rQ/CaL DAvixLGwm4LpcelVFftfUon6+IzRP/m46BpVQDyibCwvGJ2v9jE3dX4sLjVtTMcJuq GeW+GjxS0qY/W0eItKxIIYS7G7DZBlYnBVvVsdic= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id 82F663858D32 for ; Mon, 27 Jun 2022 20:37:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 82F663858D32 Received: by mail-oi1-x236.google.com with SMTP id s124so14541158oia.0 for ; Mon, 27 Jun 2022 13:37:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7QsivbgVbEZxH3nZEhHlh5Lw11hX6WtUNpyDMHSfJpw=; b=TTuJzW37rdcdO13W9anJsUklVj5iYGctYIdZ1B5AZ2A84E7+zdq/3aBEFGttnBtBLu S2d3PUBnnIA6+SUzUkN8auKOTR5TeovoWLbE7Y9bUbdiZK8p/isC/kIuHJ3MiJ5R5eYy 8UGvO/IQXzoc8wtYv5NvAa1SLjY3ou8vmq0mS0X93R5v26aD6ET2UKIe6+/2hTIZFV4R mEJAsAR7Q1wSewHXlNcZkLF7c6kMZ56a9i2xwKiVVz749Gsv0erhFLBWZZE99LMwDozK AV3UfHX+QAiPMb/ha6bzB9cDtOSMinLAxhLSo+NmRvXPkEYP9NXpC9eh3YRatWPyyfI3 ewWg== X-Gm-Message-State: AJIora+oSQHQaxxopljKhs/tbqzwPZynCjUoG+s/0/9hjKXU1vQNtljk jdKTSSGp1OgTmAnqnTBx5evz65DjSRcgJWIK X-Google-Smtp-Source: AGRyM1ssVb+V7ZbCTRi7UyWJuxNOFmIXeWBmONeZYPzOdtr4emdGgkdu+4NI/rgWAFepuAXgmUeHjA== X-Received: by 2002:a05:6808:1296:b0:32f:54ce:1561 with SMTP id a22-20020a056808129600b0032f54ce1561mr12140710oiw.73.1656362271583; Mon, 27 Jun 2022 13:37:51 -0700 (PDT) Received: from ubuntu22.. ([177.138.183.172]) by smtp.gmail.com with ESMTPSA id b132-20020aca348a000000b003357568e39fsm1767900oia.57.2022.06.27.13.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 13:37:51 -0700 (PDT) To: libc-alpha@sourceware.org, Andreas Schwab Subject: [PATCH] debug: test for more required cacellation points (BZ# 29274) Date: Mon, 27 Jun 2022 20:37:45 +0000 Message-Id: <20220627203745.58971-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" From: Andreas Schwab Generalize the test for cancellation point in __read_chk to also test the other fortified functions with required cancellation points. Since there is not easy way to force some syscalls to block (for instance pread) the test tests two modes: cancellation on blocked syscalls and early cancellation on pending request. Checked on aarch64-linux-gnu. --- debug/Makefile | 6 +- debug/tst-chk-cancel.c | 263 ++++++++++++++++++++++++++++++++++++ debug/tst-read-chk-cancel.c | 50 ------- 3 files changed, 266 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..53530db489 --- /dev/null +++ b/debug/tst-chk-cancel.c @@ -0,0 +1,263 @@ +/* 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 +#include +#include +#include +#include +#include +#include + +/* Cleanup handling test. */ +static int cl_called; + +static void +cl (void *arg) +{ + ++cl_called; +} + +static int fds[2]; +static pthread_barrier_t barrier; + +static void * +tf_read (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __read_chk because the buffer size + is known, but the read length is non-constant. */ + char c; + if (read (fds[0], &c, (uintptr_t) n) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static void * +tf_pread (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __pread_chk because the buffer size + is known, but the read length is non-constant. */ + char c; + if (pread (fds[0], &c, (uintptr_t) n, 0) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static void * +tf_pread64 (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __pread64_chk because the buffer size + is known, but the read length is non-constant. */ + char c; + if (pread64 (fds[0], &c, (uintptr_t) n, 0) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static void * +tf_poll (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __poll_chk because the pollfd size + is known, but the number of entries is non-constant. */ + struct pollfd pfd = { fds[0], POLLIN, 0 }; + if (poll (&pfd, (uintptr_t) n, -1) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static void * +tf_ppoll (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __ppoll_chk because the pollfd size + is known, but the number of entries is non-constant. */ + struct pollfd pfd = { fds[0], POLLIN, 0 }; + if (ppoll (&pfd, (uintptr_t) n, 0, 0) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static void * +tf_recv (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __ppoll_chk because the pollfd size + is known, but the number of entries is non-constant. */ + char c; + if (recv (fds[0], &c, (uintptr_t) n, 0) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static void * +tf_recvfrom (void *n) +{ + xpthread_barrier_wait (&barrier); + + if (n != (void *) 1L) + xpthread_barrier_wait (&barrier); + + pthread_cleanup_push (cl, NULL); + /* This call should be forwarded to __ppoll_chk because the pollfd size + is known, but the number of entries is non-constant. */ + char c; + if (recvfrom (fds[0], &c, (uintptr_t) n, 0, NULL, NULL) != 1) + return (void *) -1L; + + pthread_cleanup_pop (0); + return 0; +} + +static struct cancel_tests +{ + const char *name; + void *(*tf) (void *); + bool only_early; +#define ADD_TEST(name, early) { #name, tf_##name, early } +} tests[] = +{ + ADD_TEST (poll, false), + ADD_TEST (ppoll, false), + ADD_TEST (pread, true), + ADD_TEST (pread64, true), + ADD_TEST (read, false), + ADD_TEST (recv, false), + ADD_TEST (recvfrom, false), +}; + +/* Set the send buffer of socket S to 1 byte so any send operation + done with WRITE_BUFFER_SIZE bytes will force syscall blocking. */ +static void +set_socket_buffer (int s) +{ + int val = 1; + socklen_t len = sizeof (val); + + TEST_VERIFY_EXIT (setsockopt (s, SOL_SOCKET, SO_SNDBUF, &val, + sizeof (val)) == 0); + TEST_VERIFY_EXIT (getsockopt (s, SOL_SOCKET, SO_SNDBUF, &val, &len) == 0); + printf ("%s: got size %d\n", __func__, val); +} + +static int +do_test (void) +{ + xpthread_barrier_init (&barrier, 0, 2); + + if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) != 0) + FAIL_EXIT1 ("socketpair: %m"); + set_socket_buffer (fds[1]); + + for (int i = 0; i < array_length (tests); i++) + { + if (tests[i].only_early) + continue; + + xpthread_barrier_init (&barrier, NULL, 2); + /* Reset the counter for the cleanup handler. */ + cl_called = 0; + + pthread_t thr = xpthread_create (0, tests[i].tf, (void *) 1L); + xpthread_barrier_wait (&barrier); + + struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 }; + TEMP_FAILURE_RETRY (clock_nanosleep (CLOCK_REALTIME, 0, &ts, &ts)); + + xpthread_cancel (thr); + + void *status = xpthread_join (thr); + TEST_VERIFY (status == PTHREAD_CANCELED); + TEST_COMPARE (cl_called, 1); + + printf ("in-time cancel test of '%s' successful\n", tests[i].name); + } + + for (int i = 0; i < array_length (tests); i++) + { + xpthread_barrier_init (&barrier, NULL, 2); + /* Reset the counter for the cleanup handler. */ + cl_called = 0; + + pthread_t thr = xpthread_create (0, tests[i].tf, NULL); + xpthread_barrier_wait (&barrier); + + xpthread_cancel (thr); + xpthread_barrier_wait (&barrier); + + void *status = xpthread_join (thr); + TEST_VERIFY (status == PTHREAD_CANCELED); + TEST_COMPARE (cl_called, 1); + + printf ("early cancel test of '%s' successful\n", tests[i].name); + } + + 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