From nobody Thu Sep 28 20:41:28 2023 X-Original-To: dev-commits-src-branches@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 4RxQPN51pMz4vZC8; Thu, 28 Sep 2023 20:41:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RxQPN4GZBz4vPZ; Thu, 28 Sep 2023 20:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695933688; 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=lDII95SLzQHIOZiUoTJ/Y9whtTR19OvUqpABiYsly0g=; b=yNx4PCoRJZRQTxJ1QBQWH//uqZ1Y08hxrflXTVNvBT4PiQ6Qz1lvO26ZgOhr38DEyXWgVW pf+GDV/mgSKA0Qroja+WJuqbGi4LXOBLhc1LIn5p8pQUs/YYZetzBEHX+nY+z+g/AQ4XZN XLf4lK5nc1fVOSV1ZH7192JUqGlvvQ4xH9Gx6EWyavSVBp2zOeCI10zVWkjHtiUoOLxMgf 8GKrQ/7ki7vHByuudBnxqe318kgjtTCd6wc8HfQXfEKxJJJmbAc9X8GKbaRI+Lb0NCDRTO w0xvFwQ6plyVRS2j4RYm9oQW6oKBxBZoc1RSep+FAdhwxPqkxjrDd1uTrIOFOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695933688; a=rsa-sha256; cv=none; b=TBt8/XmXhmqUspJ3MheB+B0VM9Qw7SD5uO6VIA16UQC8yLaHVGUAmwO9gOt5u4RtTR06pL u93Jz389qAtzp2JyCm5XOj//4p+1rZ5s2kdjJlvUeFDgrTXqp2xuXXVQfKKkEqtbKbBIPE 9Tt/+f61sWqwIydsCCNLTU2Mh3/hJqjstLtVlySHOS5w6GWOEH/s4SGIy5w9nsgUGcZfUX IP5Ub3q1ArF7794z6zC5rOSRwklnoV2//CQ0cutPxdH0bj1l4RTwqQDvZy00dnp4foFM5O PEBn2fRjtZchqL89yqx93+osB8VNmYoKfMUW45XKM6aA9onLKa5n22WE3Zq3Tg== 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=1695933688; 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=lDII95SLzQHIOZiUoTJ/Y9whtTR19OvUqpABiYsly0g=; b=qfgYJ29Ci7XzCbdfyCmOrbgvCk0ifCVBWwdPunOJVEBcHn3mXl5ra/HR27v8IAM2TJX9E9 ADVOfY1vIpAMamsB6XZNN0fmX0Xiwjhgcwl1YsDnHknTcNhO/wB765YrTevFSJydP0RtXY Glp9j4Cmvs9dfQezNAYZaNIb2DDw5oF2qOVGN2NmTQ36a0YpiieIdoXoErI4wRHAY5NVk2 n1noUU1rQYIif1P3svYB0mVAFT1t/rO6MVMKPjDKTOdkoilFb4TISjYB4l1R8f3VoD96US ntjmHN1U1nL8f/cSlg5EVdrG/FEhWpuyaxSoV+ieTuRd0iY93dIJdsNaTlxLzQ== 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 4RxQPN3Kx6zcjP; Thu, 28 Sep 2023 20:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38SKfS5Y003002; Thu, 28 Sep 2023 20:41:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SKfSOw002999; Thu, 28 Sep 2023 20:41:28 GMT (envelope-from git) Date: Thu, 28 Sep 2023 20:41:28 GMT Message-Id: <202309282041.38SKfSOw002999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8ad93f44a5da - releng/14.0 - dtrace: Fix a kernel panic in printm() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8ad93f44a5daf804a281782271cec7423572e7c4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8ad93f44a5daf804a281782271cec7423572e7c4 commit 8ad93f44a5daf804a281782271cec7423572e7c4 Author: Domagoj Stolfa AuthorDate: 2023-09-06 13:25:00 +0000 Commit: Mark Johnston CommitDate: 2023-09-28 20:41:15 +0000 dtrace: Fix a kernel panic in printm() When using printm(), one should always pass a scratch pointer to it. This is achieved by calling printm with memref BEGIN { printm(fixed_len, memref(ptr, var_len)); } which will return a pointer to the DTrace scratch space of size sizeof(uintptr_t) * 2. However, one can easily call printm() as follows BEGIN { printm(10, (void *)NULL); } and panic the kernel as a result. This commit does two things: (1) adds a new macro DTRACE_INSCRATCHPTR(mstate, ptr, howmany) which checks if a certain pointer is in the DTrace scratch space; (2) uses DTRACE_INSCRATCHPTR() to implement a check on printm()'s DIFO return value in order to avoid the panic and sets CPU_DTRACE_BADADDR if the address is not in the scratch space. Approved by: re (gjb) Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41722 (cherry picked from commit 8527bb2aee6ca9013c34445de88217a954b6628d) (cherry picked from commit 49c1b353390cf498bcd9a3e548039e2a64f654fe) --- .../contrib/opensolaris/uts/common/dtrace/dtrace.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 02a95bfab726..ce02676e0dc1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -515,6 +515,11 @@ do { \ ((mstate)->dtms_scratch_base + (mstate)->dtms_scratch_size - \ (mstate)->dtms_scratch_ptr >= (alloc_sz)) +#define DTRACE_INSCRATCHPTR(mstate, ptr, howmany) \ + ((ptr) >= (mstate)->dtms_scratch_base && \ + (ptr) <= \ + ((mstate)->dtms_scratch_base + (mstate)->dtms_scratch_size - (howmany))) + #define DTRACE_LOADFUNC(bits) \ /*CSTYLED*/ \ uint##bits##_t \ @@ -7739,9 +7744,24 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, } case DTRACEACT_PRINTM: { - /* The DIF returns a 'memref'. */ + /* + * printm() assumes that the DIF returns a + * pointer returned by memref(). memref() is a + * subroutine that is used to get around the + * single-valued returns of DIF and is assumed + * to always be allocated in the scratch space. + * Therefore, we need to validate that the + * pointer given to printm() is in the scratch + * space in order to avoid a potential panic. + */ uintptr_t *memref = (uintptr_t *)(uintptr_t) val; + if (!DTRACE_INSCRATCHPTR(&mstate, + (uintptr_t)memref, 2 * sizeof(uintptr_t))) { + *flags |= CPU_DTRACE_BADADDR; + continue; + } + /* Get the size from the memref. */ size = memref[1];