From nobody Mon Dec 29 01:16:34 2025 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 4dfdbQ421Zz6LQgB for ; Mon, 29 Dec 2025 01:16:34 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfdbQ2yyRz3XTp for ; Mon, 29 Dec 2025 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970994; 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=mfnGfCh9uf0m3WfYZbulu/FGAH/VlYVYdz3JWPDHKL4=; b=T7PPWFV2uyEYGtJxwkI2xLxcFQUQXYC9dASl6LMHWhfK4c6AP+CHh9iUTuqpsU880SG3WT iPFukaCwChX+Xmo8DWH1sW6Ts7Fy31zu3AkNkLnFhwofycdida3mKmT36ZSlKK35flyHLN 6uzo6TCULE1ipi0j/ceY8749XrrCYWFBNuOQWaeTw34Mj3rP//MtJmbvlnc5XpRCdl+p64 YjybfU0STVd4cj/qw4LRX/HyCcM1AFc9g48Xfgh84nt59wR1E1z/aSEtUX5ejPiJh/7pfP jao0JReit9UKJ9bxwZlgmaVqJT5ajI+VVEn/6OXYy/WxxTLc5MuZAqHAH8blCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766970994; 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=mfnGfCh9uf0m3WfYZbulu/FGAH/VlYVYdz3JWPDHKL4=; b=Q3KYnvevO+gqUgrDZ9kL8cudrNoR/r94KYARP2ez4fzvFBDYAbQoxq8Hwas82o1GQx20Lr gUh55kp1DiMppu7yxQTxTVN9m1zu5yc/Pk/BEwUtJ70XZCiuYpgN5WJxnG3/YHBle7oXgm H5s9gwrB2zvKTa/81UePBHpCaufDvHQ0yyD29mLpVGHgQcm5mj7sDP2pnzC9QYw9oTfhVU Oc6M0pjyD6SFbW23bYxjP//f3Lb/P3Ex/DmfE3Gw8vXvkQJmg2N/usJ68PJP/ehONyfYel pvecO+nUzoDLuA5BhcGO/auqCVJJvd/FQ+xNmhZL/+e2XHLE/gMXuIki0KI/QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766970994; a=rsa-sha256; cv=none; b=CXy2Lz0a4HWX9KEvN7qrJUQ0Y9XGKTECGl0MKLMw4kjRZChPeqhX7jdJZgvwVw4jZ8vVRU ltC2TnhSfPYWxTkh5T3yRV3HjTV3MdejrwTy1DLUPsJabFKQuY6/jac/5JFCKtszEryXSl mdtXfU9sAY4W1P0TMKPLXy1114ipEhg5ItOzvkMA7bf9OxO3p3kG6JXaexzTik3UrDm+xY v6CcFZtrXLM9J1xgAAbLgzX+5CtJwWmh3K8Dv1ShzNn9jxCs1WPiQlazwjjxPToIhQfHsA noYtcDJMTxQ6mztlWFEvXvOBQysjtrHtQdifnjwpGwO6kmCksI+QGHxtstk17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfdbQ2BPGz18Bw for ; Mon, 29 Dec 2025 01:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 387a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 01:16:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 42210fe8dcd4 - main - exterror: Add EXTERROR_VERBOSE env variable to control verbosity 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42210fe8dcd4684a45e0e4db1b8194e291dc8fda Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 01:16:34 +0000 Message-Id: <6951d672.387a6.60c78188@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42210fe8dcd4684a45e0e4db1b8194e291dc8fda commit 42210fe8dcd4684a45e0e4db1b8194e291dc8fda Author: Konstantin Belousov AuthorDate: 2025-12-28 00:23:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-29 01:16:25 +0000 exterror: Add EXTERROR_VERBOSE env variable to control verbosity If the variable is set and the process is not suid, __uexterr_format(), used by err(3), prints errno/category/source line/pX always, not only when there is no kernel message provided. Requested by: mckusick Reviewed by: emaste, mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54380 --- lib/libc/gen/uexterr_format.c | 53 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c index 68cd2abfe312..3321fd80616d 100644 --- a/lib/libc/gen/uexterr_format.c +++ b/lib/libc/gen/uexterr_format.c @@ -11,26 +11,69 @@ #include #include #include +#include #include +#include #include +#include + +static const char exterror_verbose_name[] = "EXTERROR_VERBOSE"; +enum exterr_verbose_state { + EXTERR_VERBOSE_UNKNOWN = 100, + EXTERR_VERBOSE_DEFAULT, + EXTERR_VERBOSE_ALLOW, +}; +static enum exterr_verbose_state exterror_verbose = EXTERR_VERBOSE_UNKNOWN; + +static void +exterr_verbose_init(void) +{ + /* + * No need to care about thread-safety, the result is + * idempotent. + */ + if (exterror_verbose != EXTERR_VERBOSE_UNKNOWN) + return; + if (issetugid()) { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } else if (getenv(exterror_verbose_name) != NULL) { + exterror_verbose = EXTERR_VERBOSE_ALLOW; + } else { + exterror_verbose = EXTERR_VERBOSE_DEFAULT; + } +} int __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) { + bool has_msg; + if (bufsz > UEXTERROR_MAXLEN) bufsz = UEXTERROR_MAXLEN; if (ue->error == 0) { strlcpy(buf, "", bufsz); return (0); } - if (ue->msg[0] == '\0') { - snprintf(buf, bufsz, + exterr_verbose_init(); + has_msg = ue->msg[0] != '\0'; + + if (has_msg) { + snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, + (uintmax_t)ue->p2); + } else { + strlcpy(buf, "", bufsz); + } + + if (exterror_verbose == EXTERR_VERBOSE_ALLOW || !has_msg) { + char lbuf[128]; + + snprintf(lbuf, sizeof(lbuf), "errno %d category %u (src line %u) p1 %#jx p2 %#jx", ue->error, ue->cat, ue->src_line, (uintmax_t)ue->p1, (uintmax_t)ue->p2); - } else { - snprintf(buf, bufsz, ue->msg, (uintmax_t)ue->p1, - (uintmax_t)ue->p2); + if (has_msg) + strlcat(buf, " ", bufsz); + strlcat(buf, lbuf, bufsz); } return (0); }