From nobody Fri May 1 02:59:04 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g6G2w6gLkz6bbXZ for ; Fri, 01 May 2026 02:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6G2w4G2Sz4K9h for ; Fri, 01 May 2026 02:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777604344; 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; bh=wm6RISYr04BKYZDQQKqGeo2WVwhtzgFBaKwGBC7xdnw=; b=r0ArDun1mDPKkTfMbXZeEh9rBJdgLAFTEtIkYC+OYZUdfo5rPktr97Tm778W25Ow/BHqH5 Y2OeOR9dwlnH/qUjTp2p2rN+wW8DSXQiR5HQxAvPTp0rf6MDJLKDaAOP+bjsc9QtxO0g6d 07biSsG/bfjAb8r7Eu6Fc31bArjuqaH8pLItsJgIhyzKi0hJYYCwg9ACMNn0pmWJW5JPny XEDmdxFrB+JDcxcCKoDtYVCDgVkMoUYBO6Jty4KyaIC6rnnNYb1qmVHrWKRmWF9Yi4RcAR MngWDaZ7RyMjXPCJ5nKyiDN8LniLw5pXXziso4UwLL5+Q11qmGNAfTksqKf9cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777604344; a=rsa-sha256; cv=none; b=u9shteFqeVv4HmaO80zpX/dQv5f6GUJ/DmOM9Wk7pRq5fNNeJLp9yw3xjBW8Sz7BcIcK8B /nnlgClO13FHU3qLaNQYjXaDI9+E03BXooiJ7olOzpfUPB5JT0ETJCrm6VVcH+DCmJAlbv NPoeUtWAroSWCrubP7Rvis1UsEMY66zFDpNCtSbTw7v4z5hVubyKJhUHhjN+0C0rhDs97N PqSWof1qiAdGF+g5hoZP9E2pWeEBkJ5EIk35GY5VMxl40WzEJexH+cQ73uHRZf0zFu5pvl dYPUKFAxXukw6w2EN6xi/coYVm4G68dkY3Pg9b8jyI7tLL/g3zWWljJvRiaOCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777604344; 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; bh=wm6RISYr04BKYZDQQKqGeo2WVwhtzgFBaKwGBC7xdnw=; b=VcNNmpt95oOMlLXnEyu2DkzCC84bUMsPpvu9xuk64I4TNcprLa/SvM75ji6ng9WozeE2Mr gb+68Ynvlg5jkmzHx3L5T+HW0xxDLy4tnOyAha18Z9GZ3SznaIBZ04YS3v/UZ10yaXPcm4 EZVm0EcggWRbAxurKnoIqz6oRpqCTEYzEOVXtWDu8iiBDSfoobQWboaoDbxQhApBN1/BV/ 0Es+uBDXWoakI1FEL9/ew7s3eH+piSX8f5YVSJkjxLqQ0upzp1rQd9njRStNgndLlmzecv OaXkiIT4LW74K9cMaiNQMgSFuZwEKfU+14vr21BhqbEZltcEHT5nltHTpziZ2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6G2w3rS4zfsQ for ; Fri, 01 May 2026 02:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43746 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 02:59:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 910f78a5143a - main - tests: fix remaining test failures under _FORTIFY_SOURCE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 910f78a5143af32dfcb237a463397aa0c31c07df Auto-Submitted: auto-generated Date: Fri, 01 May 2026 02:59:04 +0000 Message-Id: <69f416f8.43746.6e22ea83@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=910f78a5143af32dfcb237a463397aa0c31c07df commit 910f78a5143af32dfcb237a463397aa0c31c07df Author: Kyle Evans AuthorDate: 2026-05-01 02:57:51 +0000 Commit: Kyle Evans CommitDate: 2026-05-01 02:58:48 +0000 tests: fix remaining test failures under _FORTIFY_SOURCE The getgroups test is a NetBSD tests, so just apply our larger hammer and disable the feature entirely. The audit test can take a more surgical approach and use __ssp_real() appropriately, since it's a local one. PR: 294881 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56735 --- include/ssp/stdio.h | 7 +++++++ lib/libc/tests/sys/Makefile | 1 + tests/sys/audit/network.c | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/ssp/stdio.h b/include/ssp/stdio.h index 17bda8d3ee2d..73c601c408ce 100644 --- a/include/ssp/stdio.h +++ b/include/ssp/stdio.h @@ -75,6 +75,13 @@ __ssp_redirect_raw_impl(char *, gets_s, gets_s, } retbuf = __ssp_real(gets_s)(buf, len); + + /* + * If the implementation did *not* handle the case correctly, then + * there's a risk that they could have corrupted us into not failing + * here. We have tests that cover this, so we'll just count on finding + * a broken implementation early on in a less hostile environmnt. + */ if (need_fail && retbuf != NULL) __chk_fail(); return (retbuf); diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile index 88f8191a16eb..ef689dcf019c 100644 --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -22,6 +22,7 @@ NETBSD_ATF_TESTS_C+= dup_test NETBSD_ATF_TESTS_C+= fsync_test NETBSD_ATF_TESTS_C+= getcontext_test NETBSD_ATF_TESTS_C+= getgroups_test +FORTIFY_SOURCE.t_getgroups.c= 0 NETBSD_ATF_TESTS_C+= getitimer_test NETBSD_ATF_TESTS_C+= getlogin_test NETBSD_ATF_TESTS_C+= getpid_test diff --git a/tests/sys/audit/network.c b/tests/sys/audit/network.c index 2d9aed34111a..52a8a25c091b 100644 --- a/tests/sys/audit/network.c +++ b/tests/sys/audit/network.c @@ -29,6 +29,8 @@ #include #include +#include + #include #include #include @@ -959,7 +961,7 @@ ATF_TC_BODY(recvmsg_failure, tc) snprintf(extregex, sizeof(extregex), "recvmsg.*return,failure : Bad address"); FILE *pipefd = setup(fds, auclass); - ATF_REQUIRE_EQ(-1, recvmsg(-1, NULL, 0)); + ATF_REQUIRE_EQ(-1, __ssp_real(recvmsg)(-1, NULL, 0)); check_audit(fds, extregex, pipefd); }