From nobody Fri Jun 23 13:53:40 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 4Qndxc5Vzvz4gJT2; Fri, 23 Jun 2023 13:53:40 +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 4Qndxc4cyDz4lD9; Fri, 23 Jun 2023 13:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687528420; 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=JO2GfbH66/eAqEVCpbuVbWNE/52AShDvy9VpGwYMUAk=; b=VnInCuDM7Li5wZagk6WDMBQCaiwn11oOeDJVGmVN6GsLJyrkrcmqGj0XxMfguMwdSJt22q 5k/biAB4glpt6KzIPqZJEsPjgyBMIHqiY5mMJLu18Qs4yRMHk65vzHnCiwlHjuFjLRC/pY kETy7hdKHmJOW1/g68WAzsrT9tDQ/rdVZdjaKCalcwrib+jeVQAjSjFy7RH2Q0RfegAd6s VS0snt63f0NgxMiCD97H0WW7+WTHDz7Ls+ypFJU3WHGZl+zqyqUCRS0O8QDWFcsYeth7Ws f4yOqkCJiN339RsK9iMpKh++8MgyCG3e33xVsFefhNpR+bKQisI3cfnWJKscLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687528420; 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=JO2GfbH66/eAqEVCpbuVbWNE/52AShDvy9VpGwYMUAk=; b=puQgzZg5jBGp4XbgORTPxXqGr3IRuu+AWmZd0sLfwAciMpfatohM2AftFLqskoJ2ovIlMs voIUYuY5OGKQmrse6A1KYDOhK2ZD9+1mPSO8Z/YaZL/7hZhocPesxIb1QSNw1pl5J09rJb EeK8qF4+cRATMKlM6SoXmux3aI0hLvemURNB2O0ZgBeLJF2DenRaYZtK4fAG/6omy00WMK 3s/1628HMC+58hBAPyUKzsqTp4xRDFF374FXiUTPQRC5a/nUS86z6iYxoIPHTEzoKg7W9V SHaZpk2Fma6NYSsu1VgyQo2jokvsCQw1xmhb9cqf4rhYnWJIYqHz7HDB2r+DGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687528420; a=rsa-sha256; cv=none; b=c69n4VGJj5Kf1lyMJZGBMEBkEQvWtPh3i4uBbVmKBFUNG8I9dXS/Fc2+jPTlG+PlqUmN0I Qcw2F65/p9cYR64Sj4Z62OR8R4sw5zvjNS8PxZccV5wMwUasN/6x4aZv9bQh2ZoURh6RSm oRERK3rpkJfHMQTg5NyERm7UWNfoA6YnUGRCsTvIXVFEPICYIrPTcAd13AH2p62lK7WPkp Yy4pNZtMl+fK59H1rp6W0+xJmm755j5DhQBzUeToD5FnsTQF/+ls1xX/N6WKMUe8n724xd iQvcrpDTPB5zmOQ63XBqegpkBneuK738A/bMAGlCV1X/tv6vrXYoUuErRwPlNw== 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 4Qndxc3S6wz16Rx; Fri, 23 Jun 2023 13:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NDre20020875; Fri, 23 Jun 2023 13:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NDrepV020874; Fri, 23 Jun 2023 13:53:40 GMT (envelope-from git) Date: Fri, 23 Jun 2023 13:53:40 GMT Message-Id: <202306231353.35NDrepV020874@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: 7d86d8ed848e - stable/13 - dtrace/arm64: Fix user memory access routines 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d86d8ed848e06bdc6c2d352564d7b78818b023e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d86d8ed848e06bdc6c2d352564d7b78818b023e commit 7d86d8ed848e06bdc6c2d352564d7b78818b023e Author: Mark Johnston AuthorDate: 2023-06-15 16:39:21 +0000 Commit: Mark Johnston CommitDate: 2023-06-23 13:34:17 +0000 dtrace/arm64: Fix user memory access routines Use unprivileged loads to access user memory. Without this, the accesses trap and various dtrace actions such as ustack() fail. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40540 (cherry picked from commit 6281147a963b02bb5d7b4db15ee295d6d65d0fff) --- sys/cddl/dev/dtrace/aarch64/dtrace_asm.S | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S index 710232a0d428..913429865421 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S @@ -72,7 +72,7 @@ uint8_t dtrace_fuword8_nocheck(void *addr) */ ENTRY(dtrace_fuword8_nocheck) - ldrb w0, [x0] + ldtrb w0, [x0] RET END(dtrace_fuword8_nocheck) @@ -81,7 +81,7 @@ uint16_t dtrace_fuword16_nocheck(void *addr) */ ENTRY(dtrace_fuword16_nocheck) - ldrh w0, [x0] + ldtrh w0, [x0] RET END(dtrace_fuword16_nocheck) @@ -90,7 +90,7 @@ uint32_t dtrace_fuword32_nocheck(void *addr) */ ENTRY(dtrace_fuword32_nocheck) - ldr w0, [x0] + ldtr w0, [x0] RET END(dtrace_fuword32_nocheck) @@ -99,7 +99,7 @@ uint64_t dtrace_fuword64_nocheck(void *addr) */ ENTRY(dtrace_fuword64_nocheck) - ldr x0, [x0] + ldtr x0, [x0] RET END(dtrace_fuword64_nocheck) @@ -110,7 +110,8 @@ dtrace_copy(uintptr_t uaddr, uintptr_t kaddr, size_t size) ENTRY(dtrace_copy) cbz x2, 2f /* If len == 0 then skip loop */ 1: - ldrb w4, [x0], #1 /* Load from uaddr */ + ldtrb w4, [x0] /* Load from uaddr */ + add x0, x0, #1 strb w4, [x1], #1 /* Store in kaddr */ sub x2, x2, #1 /* len-- */ cbnz x2, 1b @@ -126,8 +127,9 @@ XXX: Check for flags? */ ENTRY(dtrace_copystr) cbz x2, 2f /* If len == 0 then skip loop */ - -1: ldrb w4, [x0], #1 /* Load from uaddr */ +1: + ldtrb w4, [x0] /* Load from uaddr */ + add x0, x0, #1 strb w4, [x1], #1 /* Store in kaddr */ cbz w4, 2f /* If == 0 then break */ sub x2, x2, #1 /* len-- */