From nobody Wed Sep 27 12:52:28 2023 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 4Rwc2h41xVz4vQc5; Wed, 27 Sep 2023 12:52: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 4Rwc2h3F5jz4THn; Wed, 27 Sep 2023 12:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695819148; 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=RQYNsRaw4BIS8ulq/t0m7pHUtxIKjNyBecjq5SZTffk=; b=VJV8tibXNAh/Gbn5HfXj+G7fefSPYo8cBfM3ERTaoDM78VGHbM1LUybOFI9KYsg9A4z53z SUi/uFqf9eLiLxDgqfkzFp0HlF8qzxMafs/k6DCQPZ5b4X8haiQ9sfnQiObPcobspeU8Re tUR1tu3wjYfCWouBQ9cgaqDGsLXJrGKfzMmoFK/YBIwVZ7njGwYZA0drkbbL8F2jr71bNq 2wLqdpu6EWa5U1QknNBdVAtrHEjB8WmYbMOlbzdBLpERtOsNFzi+KfGRs3r9O65Np9cOX6 MFaoxcJkf9PNvx+QO4rh89edCg1fcwYLqZH85PmcudYsCP5Ryln501HZZojEMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695819148; a=rsa-sha256; cv=none; b=mA6IrznhkZuDO2XyNPIAsXoxeKpP59BWd03Pc4LA4Vh5+BPGIFkuSYvESVo0nGt3ipdIl6 Etw4PvQbsLvWbiNQ/9Gbktsl3aWwg8us28gV4EldT6FkYG+71GIU3zUSfZeRDpHU5IXG7O 9WjLOu/dTAsAL1yXJSrRfuWuEDiGHuqTmnflubHmFaYQeLIbYGjwtxvoiQEErl6ctmukx0 gaUJag+2nQ94zjX1YbRUiAdke7lBNH6A9XjeA+rzHWyKJwOrhBJVcvgM1LLInymw1rZYE/ Ib+PrZEzXKa6ZBZCIFaTxrT+MlMUajsDs5uKQ4IXzshx/+vDimXlsIEx/ZUzNQ== 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=1695819148; 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=RQYNsRaw4BIS8ulq/t0m7pHUtxIKjNyBecjq5SZTffk=; b=VmyhnFaeMdaUyy5oCR8re8F1Kpf3xX5S1iJjUkI7EfINaVmVDQkIS1kUfmO2wWGy/vrvpI 8MAgvLc54w2rSrf2a8Xhxjk6AQaom5H91+jXqKsBL0bjCMkm8A52Pm0D3B3Tp+wcS8I1pi S30L9cdklZyWWoWqpVQF3sXsJ8mUbG0iiRBcm/RpoFwDAL2vahX2vOhv7ve3Iq4Cmh4aez 3F0i9ny51SGB9QXMJiG01almAtG/rwS8X3BCJqs2A1Ptopnd52IQKrVq/WSkVFWJGDorB7 hm/XhdBkeFG0HnJKKmh5KrJVfGRuYmG6Qhur8I9fIjs+SXQITx0rl8S4ZhECSA== 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 4Rwc2h1vHXzgDf; Wed, 27 Sep 2023 12:52: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 38RCqSij023203; Wed, 27 Sep 2023 12:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38RCqS3C023200; Wed, 27 Sep 2023 12:52:28 GMT (envelope-from git) Date: Wed, 27 Sep 2023 12:52:28 GMT Message-Id: <202309271252.38RCqS3C023200@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: 0df75d6c87a5 - stable/13 - dtrace: Fix a kernel panic in printm() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0df75d6c87a5f43de444ab6ae2093cc69f646c82 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0df75d6c87a5f43de444ab6ae2093cc69f646c82 commit 0df75d6c87a5f43de444ab6ae2093cc69f646c82 Author: Domagoj Stolfa AuthorDate: 2023-09-06 13:25:00 +0000 Commit: Mark Johnston CommitDate: 2023-09-27 12:35:50 +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. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41722 (cherry picked from commit 8527bb2aee6ca9013c34445de88217a954b6628d) --- .../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 972ec6c66723..6ae0322ebb0f 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 \ @@ -7736,9 +7741,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];