From nobody Thu Aug 20 10:41:57 2026 X-Original-To: dev-commits-src-all@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 4hQg3p2WDjz6pZs3 for ; Thu, 20 Aug 2026 10:41:58 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hQg3n5szqz3yDt for ; Thu, 20 Aug 2026 10:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787222517; 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=w4Wi97D0M9zM8Yu1+8mcbekR0Y4sH6G/4qt1M0nwoU0=; b=dE8B3Sz4DHPXQMCofp/JIj9GYUUXjIFgNqaYeSywvtq0VhK26MJXnxSvulCCW0sIHTawSo vaTEjRGytZWp3IeLUNI2hGP2alt0nnUc0W+kPHFvMNIW0Ks1DZ9oHuLobg/MTLouaW0HFn A90whfRKn4ySHMmr3vrPyr2b8OJ0ZzjEI0Iz/jmGfUO/OjQioG/qHzxOXSmR3KSGjq7t1/ SuCeFXVIm2HwJjoW+0EQLjcRu+VwyBdm3/zfPM3uhmSzCnZ+4zODF3soqbD8JQHRVw5mwX x1eKxp79J2wN/drmJAvQQTEZGLYP7up4lL5el+5DH7D8UyQTaR78cHRkpfbVwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787222517; a=rsa-sha256; cv=none; b=FOkzVOhqxBq4s3JczKxyI69kVwG8IPMyeRAuny9fXDEmip5YOcRL7lD/KtgPWYR7lt8m0S HKxwcTCTfw8hoDTzoPQrppPaV9fvcab6nheBhc3zOyfcKPOvo+70zb+wlpOq2DQScG637i nMAZjGGmXYXQMJvbtXwWarMylllJ5XBQSjKfBDMuH5xjfm7LNk1ngllfDz7nlnnOgjD0zp EewnY4BEr7xpUYRzNwdVfCiEo8fF4qrQIBaaoq0CMZ/kM9hmmzcyhM+IAHa5tfVKAHg2uA gGWsDWWa7iGX5fBXF4hiCaBQWQNININCl1qEhOO5DGOgGJsco3qXsCLZbS3F9w== 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=1787222517; 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=w4Wi97D0M9zM8Yu1+8mcbekR0Y4sH6G/4qt1M0nwoU0=; b=nMZK2uvHyeTty+PoZHd3uF2mmIZWHjV1rB8w1BBYa7SxSnt5CE1eAfQWO6Bg2mCYlHhk19 DrMZhbqbB5Lhb8RtyRYYLPMI1clG/sVk9rsGQzuL3B59QftPhsalIhUlEt1plmt2+K5dvd H7279s/msV3v1j49F0gae8dyQJELldoHjVdkCJazKUdrfh77pc5R1WFIxMDsS42IZnphb9 Pf/tU0FHBJWhBbJYtzsWYtud229EbmqJdg4RCilW//h1KD6gWHGgO2uRwO6aKCsUtp+Vvm bvWIX3FDli/8jYl/wrOvfhtQYkJnIJZSMMW/a3tQi71P94Lon1J0e8t1r6cR9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQg3n1dblz1CmN for ; Thu, 20 Aug 2026 10:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c73 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 10:41:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 94f86eff72ed - main - uexterror_gettext: add tests for invalid formats List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94f86eff72ed43a38a12a41cd5945afe00c8199a Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 10:41:57 +0000 Message-Id: <6a86d9f5.41c73.6d0171f5@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=94f86eff72ed43a38a12a41cd5945afe00c8199a commit 94f86eff72ed43a38a12a41cd5945afe00c8199a Author: Brooks Davis AuthorDate: 2026-08-20 10:40:06 +0000 Commit: Brooks Davis CommitDate: 2026-08-20 10:40:41 +0000 uexterror_gettext: add tests for invalid formats Verify that unsupported, unterminated, and overly long formats output expected messages. Reviewed by: kib Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D58413 --- tests/sys/kern/exterr_test.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/sys/kern/exterr_test.c b/tests/sys/kern/exterr_test.c index 75de58d27206..fc040c53517d 100644 --- a/tests/sys/kern/exterr_test.c +++ b/tests/sys/kern/exterr_test.c @@ -108,6 +108,71 @@ ATF_TC_BODY(uexterr_set, tc) ATF_CHECK_STREQ("long 0xffffffffffffffff int 4294967295", exterr); } +static void +check_bad_fmt(const char *fmt) +{ + char exterr[UEXTERROR_MAXLEN]; + char expected[UEXTERROR_MAXLEN]; + int r; + + sprintf(expected, ":%s", fmt); + + errno = 0; + UEXTERROR(EINVAL, fmt, 0xAAAAAAAAAAAAAAAA); + ATF_CHECK_EQ(errno, EINVAL); + r = uexterr_gettext(exterr, sizeof(exterr)); + ATF_CHECK_EQ(0, r); + ATF_CHECK_STREQ(expected, exterr); +} + +ATF_TC(uexterr_bad_fmt); +ATF_TC_HEAD(uexterr_bad_fmt, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test invalid or unsupported formats"); +} +ATF_TC_BODY(uexterr_bad_fmt, tc) +{ + char exterr[UEXTERROR_MAXLEN]; + int r; + int target = 0; + + /* Write gadget */ + errno = 0; + UEXTERROR(EINVAL, "write to %n", (uintptr_t)&target); + ATF_CHECK_EQ_MSG(0, target, "Write via %%n happened"); + ATF_CHECK_EQ(errno, EINVAL); + r = uexterr_gettext(exterr, sizeof(exterr)); + ATF_CHECK_EQ(0, r); + ATF_CHECK_STREQ("write to :%n", exterr); + + /* Too long */ + errno = 0; + UEXTERROR(EINVAL, "%llllllllllllllllllllllllllllllllllllllllllllllld", + 0xAAAAAAAAAAAAAAAA); + ATF_CHECK_EQ(errno, EINVAL); + r = uexterr_gettext(exterr, sizeof(exterr)); + ATF_CHECK_EQ(0, r); + ATF_CHECK_STREQ("", exterr); + + /* Incomplete */ + check_bad_fmt("%"); + check_bad_fmt("%l"); + + /* Obsolete or nonsensical */ + check_bad_fmt("%D"); + check_bad_fmt("%O"); + check_bad_fmt("%U"); + check_bad_fmt("%f"); + check_bad_fmt("%F"); + check_bad_fmt("%g"); + check_bad_fmt("%G"); + check_bad_fmt("%a"); + check_bad_fmt("%A"); + check_bad_fmt("%S"); + check_bad_fmt("%s"); + check_bad_fmt("%m"); +} + ATF_TC(gettext_noextended); ATF_TC_HEAD(gettext_noextended, tc) { @@ -184,6 +249,7 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, gettext_extended); ATF_TP_ADD_TC(tp, uexterr_set); + ATF_TP_ADD_TC(tp, uexterr_bad_fmt); ATF_TP_ADD_TC(tp, gettext_noextended); ATF_TP_ADD_TC(tp, gettext_noextended_after_extended); ATF_TP_ADD_TC(tp, exterr_dynamic_categories);