From 00dd34ba49b44d513b25fbbf7d6904f431045f82 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 28 Apr 2024 00:41:33 +0000 Subject: [PATCH 1/2] libstdc++: Add test for PR lib/58206, sync_with_stdio busted. --- distrib/sets/lists/debug/mi | 1 + distrib/sets/lists/tests/mi | 6 ++++ etc/mtree/NetBSD.dist.tests | 2 ++ tests/lib/libstdc++/Makefile | 13 ++++++++ tests/lib/libstdc++/h_cin_nosync.cc | 40 ++++++++++++++++++++++ tests/lib/libstdc++/t_sync_with_stdio.sh | 42 ++++++++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 tests/lib/libstdc++/Makefile create mode 100644 tests/lib/libstdc++/h_cin_nosync.cc create mode 100644 tests/lib/libstdc++/t_sync_with_stdio.sh diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi index b9560a6b5729..fda031c8850b 100644 --- a/distrib/sets/lists/debug/mi +++ b/distrib/sets/lists/debug/mi @@ -2386,6 +2386,7 @@ ./usr/libdata/debug/usr/tests/lib/librumphijack/h_netget.debug tests-lib-debug debug,atf,rump ./usr/libdata/debug/usr/tests/lib/libskey/t_algorithms.debug tests-lib-debug debug,atf,skey,compattestfile ./usr/libdata/debug/usr/tests/lib/libsljit/h_sljit.debug tests-lib-debug debug,atf,sljit,compattestfile +./usr/libdata/debug/usr/tests/lib/libstdc++/h_cin_nosync.debug tests-lib-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libtre/h_regex_att.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/lib/libtre/t_exhaust.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libtre/t_regex_att.debug tests-lib-debug debug,atf,compattestfile diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi index a73139db826a..13c9b067edf5 100644 --- a/distrib/sets/lists/tests/mi +++ b/distrib/sets/lists/tests/mi @@ -149,6 +149,7 @@ ./usr/libdata/debug/usr/tests/lib/librumphijack tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libskey tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libsljit tests-lib-debug compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libstdc++ tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libtre tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libusbhid tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libutil tests-lib-debug compattestfile,atf @@ -4072,6 +4073,11 @@ ./usr/tests/lib/libsljit/Kyuafile tests-lib-tests compattestfile,atf,sljit,kyua ./usr/tests/lib/libsljit/h_sljit tests-lib-tests compattestfile,atf,sljit ./usr/tests/lib/libsljit/t_sljit tests-lib-tests compattestfile,atf,sljit +./usr/tests/lib/libstdc++ tests-lib-tests compattestfile,atf +./usr/tests/lib/libstdc++/Atffile tests-lib-tests compattestfile,atf +./usr/tests/lib/libstdc++/Kyuafile tests-lib-tests compattestfile,atf,kyua +./usr/tests/lib/libstdc++/h_cin_nosync tests-lib-tests compattestfile,atf +./usr/tests/lib/libstdc++/t_sync_with_stdio tests-lib-tests compattestfile,atf ./usr/tests/lib/libtre tests-lib-tests compattestfile,atf ./usr/tests/lib/libtre/Atffile tests-lib-tests compattestfile,atf ./usr/tests/lib/libtre/Kyuafile tests-lib-tests compattestfile,atf,kyua diff --git a/etc/mtree/NetBSD.dist.tests b/etc/mtree/NetBSD.dist.tests index 3e1cf3954c2c..e9736aa5c9ab 100644 --- a/etc/mtree/NetBSD.dist.tests +++ b/etc/mtree/NetBSD.dist.tests @@ -129,6 +129,7 @@ ./usr/libdata/debug/usr/tests/lib/librumphijack ./usr/libdata/debug/usr/tests/lib/libskey ./usr/libdata/debug/usr/tests/lib/libsljit +./usr/libdata/debug/usr/tests/lib/libstdc++ ./usr/libdata/debug/usr/tests/lib/libtre ./usr/libdata/debug/usr/tests/lib/libusbhid ./usr/libdata/debug/usr/tests/lib/libutil @@ -341,6 +342,7 @@ ./usr/tests/lib/librumphijack ./usr/tests/lib/libskey ./usr/tests/lib/libsljit +./usr/tests/lib/libstdc++ ./usr/tests/lib/libtre ./usr/tests/lib/libtre/data ./usr/tests/lib/libusbhid diff --git a/tests/lib/libstdc++/Makefile b/tests/lib/libstdc++/Makefile new file mode 100644 index 000000000000..cd1dd5120c3d --- /dev/null +++ b/tests/lib/libstdc++/Makefile @@ -0,0 +1,13 @@ +# $NetBSD$ +# + +NOMAN= # defined + +TESTSDIR= ${TESTSBASE}/lib/libstdc++ +BINDIR= ${TESTSDIR} + +TESTS_SH+= t_sync_with_stdio +PROG_CXX+= h_cin_nosync + + +.include diff --git a/tests/lib/libstdc++/h_cin_nosync.cc b/tests/lib/libstdc++/h_cin_nosync.cc new file mode 100644 index 000000000000..6ea6992d4bde --- /dev/null +++ b/tests/lib/libstdc++/h_cin_nosync.cc @@ -0,0 +1,40 @@ +/* $NetBSD$ */ + +/*- + * Copyright (c) 2024 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +int +main(void) +{ + char buf[128]; + + std::ios::sync_with_stdio(false); + std::cin.read(buf, sizeof(buf)); + std::cout << std::cin.gcount() << std::endl; + return 0; +} diff --git a/tests/lib/libstdc++/t_sync_with_stdio.sh b/tests/lib/libstdc++/t_sync_with_stdio.sh new file mode 100644 index 000000000000..e60a6e4c9647 --- /dev/null +++ b/tests/lib/libstdc++/t_sync_with_stdio.sh @@ -0,0 +1,42 @@ +# $NetBSD$ +# +# Copyright (c) 2024 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +cin_nosync_head() +{ + atf_set descr "Check cin works after std::ios::sync_with_stdio(false)" +} +cin_nosync_body() +{ + echo hello >in + atf_expect_fail "PR lib/58206: sync_with_stdio breaks reads from cin" + atf_check -o inline:'6\n' "$(atf_get_srcdir)"/h_cin_nosync Date: Sun, 28 Apr 2024 00:48:49 +0000 Subject: [PATCH 2/2] libstdc++: Don't try to fflush stdin. It doesn't work. It's undefined behaviour. On NetBSD, it will fail with EBADF, if fd 0 isn't open for write, or if fd 0 is open for write, it will write heap garbage to fd 0. If stream points to an output stream or an update stream in which the most recent operation was not input, the fflush function causes any unwritten data for that stream to be delivered to the host environment to be written to the file; otherwise, the behavior is undefined. (ISO C11 and ISO C17, Sec. 7.21.5.2 `The fflush function') PR lib/58206 --- .../gpl3/gcc/dist/libstdc++-v3/config/io/basic_file_stdio.cc | 4 ++-- tests/lib/libstdc++/t_sync_with_stdio.sh | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/external/gpl3/gcc/dist/libstdc++-v3/config/io/basic_file_stdio.cc b/external/gpl3/gcc/dist/libstdc++-v3/config/io/basic_file_stdio.cc index ba830fb9e97d..a6c9a4e249d2 100644 --- a/external/gpl3/gcc/dist/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/external/gpl3/gcc/dist/libstdc++-v3/config/io/basic_file_stdio.cc @@ -190,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { this->close(); } __basic_file* - __basic_file::sys_open(__c_file* __file, ios_base::openmode) + __basic_file::sys_open(__c_file* __file, ios_base::openmode __mode) { __basic_file* __ret = NULL; if (!this->is_open() && __file) @@ -199,7 +199,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // POSIX guarantees that fflush sets errno on error, but C doesn't. errno = 0; do - __err = fflush(__file); + __err = (__mode == std::ios_base::in ? 0 : fflush(__file)); while (__err && errno == EINTR); errno = __save_errno; if (!__err) diff --git a/tests/lib/libstdc++/t_sync_with_stdio.sh b/tests/lib/libstdc++/t_sync_with_stdio.sh index e60a6e4c9647..fb95318d666a 100644 --- a/tests/lib/libstdc++/t_sync_with_stdio.sh +++ b/tests/lib/libstdc++/t_sync_with_stdio.sh @@ -32,7 +32,6 @@ cin_nosync_head() cin_nosync_body() { echo hello >in - atf_expect_fail "PR lib/58206: sync_with_stdio breaks reads from cin" atf_check -o inline:'6\n' "$(atf_get_srcdir)"/h_cin_nosync