From nobody Sun Feb 16 21:27: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 4YwzQZ43tsz5nxy1; Sun, 16 Feb 2025 21:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwzQZ3Gfvz3Vf6; Sun, 16 Feb 2025 21:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739741254; 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=Upgrx8uAIc0HEMB/JtH81gj4gpQ1uERJ+w8aRQiDxe8=; b=pZtcv59Fwigf02G9J4KiMFMyXnoTA6KGTW/1JtE+m7tk0BbOeoJWXAJA7lEhtGo4kHvONc YSdnJjIikbA8NiIyNhClKSbnaoxShrOrP8GAl6KwcALVedCnWcsXqx3aJVriFaBJ4JpUhR hrcpjs6fcU5J+CCFfPP8mUjrvSmzydZ6c/ydtPjCGVWAIN3KNiyYLNCg6bpZTrY/MGTMkU Rv0kWLQm+qvPRrDPO3nl6rGywg2eu7ssTRjPGkytl3/3OqrZ4JhRxolGGwQDCMja8hHuc4 /5e9ArNH65pfQez4cs5aQJQl1t4RgnNxGy3d277Ahl4SqemcJW4WI9t7czN8gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739741254; a=rsa-sha256; cv=none; b=fbZxM7XUNYpbSjq1h1npeywgO0tSu/gMg3/yYNxykMbFTBKEm0sQpR5wzmg+eufgZYZD8t ggcUDEbgGPWme18z+HivxGBV3t2nHLov/IRZ3vZf595utnWXRWOjWfT9r1sNxh/vF4KzhU hskDEpqjzUYrTTlTsKGb7qosyszX1hzyJuBLaDIECTb9+iMDti+VoGEsaDBjB3JJA9VLDZ Xl/eFVMV1M9v9YCRLmtIslJrB6X6piCy1t4Muir1O0vA7z5RMzZLUhGblAZL6szg89f4LP pC16xPfBVeNjZTjofE4Z6eGteqe8k+CwS7eF0Xkao834ccnAuijTgJYpu0MeeA== 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=1739741254; 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=Upgrx8uAIc0HEMB/JtH81gj4gpQ1uERJ+w8aRQiDxe8=; b=GVxNa45APIjZchlkLqQsvBF14HohxcY2gyrODkR3RSVHQf30WHvIJ/u/c+13JDfsKbjGhq YH19gj5voOLNAm+opB4u2AihvBcn5Em4+AKm8iNhRY2akjvq1cwJlmm05Vc00v4Gb8WRUZ ONFf+v8DCl4ZDlGdmUiN9AQzSfiXKbOOLbjOeP5NYitBbLLosDpqzEGA2pfb3Tc3cU0+o0 k7yyA9EbQ3sWdILcuq9/RWse/lFGB1daMNAOO0QayBa0iqni6Jjq+vt6gpJBofaramxFQP zRN0hD0PRq4mQOwRq9hOA2aKrDryTQGCzUwaUzjRgnZimYBk/xgUxY3l8zHoLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YwzQZ2XwHz14G1; Sun, 16 Feb 2025 21:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51GLRYdn096574; Sun, 16 Feb 2025 21:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GLRYQM096571; Sun, 16 Feb 2025 21:27:34 GMT (envelope-from git) Date: Sun, 16 Feb 2025 21:27:34 GMT Message-Id: <202502162127.51GLRYQM096571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 3f850550d606 - main - pctrie: Fix size of printed value in KASSERT 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f850550d6067bd0f549602d3b372939bd214e31 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=3f850550d6067bd0f549602d3b372939bd214e31 commit 3f850550d6067bd0f549602d3b372939bd214e31 Author: Doug Moore AuthorDate: 2025-02-16 21:24:13 +0000 Commit: Doug Moore CommitDate: 2025-02-16 21:27:21 +0000 pctrie: Fix size of printed value in KASSERT The value 'index' in a pctrie iterator cannot be written with "%lx" on a 32-bit machine. Use '%jx' after a uintmax_t cast instead. Reported by: bz Fixes: bba883df5e88d0fb1133b23c05db5501dd321ad8 --- sys/kern/subr_pctrie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 51be005cccd7..a17c386a6e24 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -900,7 +900,8 @@ pctrie_iter_remove(struct pctrie_iter *it, struct pctrie_node **freenode) { KASSERT(NULL != pctrie_match_value(pctrie_node_load(pctrie_child( it->ptree, it->node, it->index), NULL, PCTRIE_LOCKED), it->index), - ("%s: removing value %lx not at iter", __func__, it->index)); + ("%s: removing value %jx not at iter", __func__, + (uintmax_t)it->index)); pctrie_remove(it->ptree, it->node, it->index, freenode); if (*freenode != NULL) it->node = pctrie_parent(it->node);