From nobody Mon Mar 10 03:04:09 2025 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 4ZB1vF2L8Zz5qBR3; Mon, 10 Mar 2025 03:04:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZB1vF1lPSz3j8B; Mon, 10 Mar 2025 03:04:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741575849; 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=e4Acli812eoT9D6UTHyRTmGF7S43JV24mBKn6SUeu8A=; b=ffNtmraHb0uqtyVYVJVbmjYC8TvNPoDrRRo32/Z+L95I+H+IFXGwujFvA/257PUwxusLSR 723ZYd8SvvhgMDksfdyBHzEYVXfESLRgb+Wor4RA3PPWnw+HqwjXJ1UH/uA/QTtFAH2v8c O5ZiVld0Jaj9faXyYipZNOnaYS540IbN8xQhJFHD2MHt4zYta2pdiGGbjEBprvtWEa9HuA WFafdBy5ZnDSaMRi4MFmuHK2QIxfX5eJgFSN62QBkpfbfbzafvbHE0bc4kXMMihav3YOH8 JJnzo+kXoA8vkF0RSulB4EKw6nJbEaFWbyNys9xF/bCkNvvpo9QSEEMNH041cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741575849; a=rsa-sha256; cv=none; b=FLEGc4t0HHBeWhgcOWwjUROWh2Yw6NcBI9HplNx9c60qvgCC827VmS9znowmIaxO6IT8be W3Vz7VSzH9W77GZPDwrWfbcb3UKh2qVyRfqdjM/9xQjmQiL/8hH2v6JMiWcKrZiLEiR3Yf c8QYRa8s0gtQdH4/6veUqURTvlGruxQUiMFlY/ID+m9z2v93Mg/YCLbNpri+y1Xl+rDWyv 8a+3ticNktAqAaJJuuGhGTixeA4uY+ZrAQk8bYgiVfwha1BpB/fT4k/5Ct5HsAG0bCL6Rp vZD2FZ9YNfBTgdgf1kyQ8pldj2w1q+YBcQqvUyRr9oMqTAvZ2W7WQrHztaYCMg== 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=1741575849; 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=e4Acli812eoT9D6UTHyRTmGF7S43JV24mBKn6SUeu8A=; b=nJGLoYCCBbcQrNIwMkbORnauOfCTKwjClR6/ROL/SduTgRikvROn/XZDG5hiAKQcAiabAM 3hFePOfwS7EIkTDBlK+2+wfUpPub5hILQs05FPyPME0/D7VJxjTr6iRa3uVH8o1NqyPgbW 9fN5sk0oeb/JGXxHnLYhlmGfgq/j4MGPr5QmWiAp8F7oOiK4PgGhycvztRLT7n61dE/bqM JBy/jGx80ffvKvhOXwEPznOA47HWybX8lrX2/o82WgPBLL6Dm2cjrv3f3lewmi7mb2wrJK eDMftcLip1hKwGNt0XG4MRujsCrW6ytQEX2w2XcvW0IgnLiS9VygL4vrAfbfVw== 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 4ZB1vF1842z62w; Mon, 10 Mar 2025 03:04:09 +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 52A349Bp098998; Mon, 10 Mar 2025 03:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52A349Sj098995; Mon, 10 Mar 2025 03:04:09 GMT (envelope-from git) Date: Mon, 10 Mar 2025 03:04:09 GMT Message-Id: <202503100304.52A349Sj098995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7ee1bdd094d3 - main - libdtrace: Fix an off-by-one in the priority queue implementation 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ee1bdd094d376fdc547e8ca33e472f1d37a7d79 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7ee1bdd094d376fdc547e8ca33e472f1d37a7d79 commit 7ee1bdd094d376fdc547e8ca33e472f1d37a7d79 Author: Mark Johnston AuthorDate: 2025-03-10 03:00:42 +0000 Commit: Mark Johnston CommitDate: 2025-03-10 03:00:42 +0000 libdtrace: Fix an off-by-one in the priority queue implementation The zero'th index in the array is unused, so a priority queue of N elements needs N+1 array slots. Fix the allocation. Also fix the assertion in dt_pq_insert(): the assertion needs to be checked after incrementing the count of items in the priority queue, otherwise it can miss an overflow. Reported by: CHERI MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D49242 --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c index 0cd556abd8f5..ffbac8b6ea1e 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c @@ -37,7 +37,7 @@ dt_pq_init(dtrace_hdl_t *dtp, uint_t size, dt_pq_value_f value_cb, void *cb_arg) if ((p = dt_zalloc(dtp, sizeof (dt_pq_t))) == NULL) return (NULL); - p->dtpq_items = dt_zalloc(dtp, size * sizeof (p->dtpq_items[0])); + p->dtpq_items = dt_zalloc(dtp, (size + 1) * sizeof (p->dtpq_items[0])); if (p->dtpq_items == NULL) { dt_free(dtp, p); return (NULL); @@ -73,9 +73,9 @@ dt_pq_insert(dt_pq_t *p, void *item) { uint_t i; - assert(p->dtpq_last < p->dtpq_size); - i = p->dtpq_last++; + assert(i <= p->dtpq_size); + p->dtpq_items[i] = item; while (i > 1 && dt_pq_getvalue(p, i) < dt_pq_getvalue(p, i / 2)) {