From nobody Mon Feb 21 13:48:48 2022 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 1100E1839935; Mon, 21 Feb 2022 13:48:49 +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 4K2Ntm6TZ1z3PgX; Mon, 21 Feb 2022 13:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645451329; 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=Rh0MAYVj1ECT4rmDMCiJhAeWl25JCGyDKZlJdFnOZ04=; b=iVmeCUlOj1LNduyGrQ0evHodJ9eqYLaX4p2Fls4m7evShO0HzqtKwMPk7ZUWsIt86bSTrS LNCSbwjL8WrYtT54xPZXyjmC38yfQGqtZcCxI0Hw7j0IINYdOoeqooWvIET4CoZUKS2x3p sTn/mP+t45fdbmIGJMDsiWoyLYPYnQ+lGJHnUVhwHehdwosvvfvXTxFue1htf6GrUvBQiy PZwaanpCBWG7Gu3S16h+6qIxc0VM8GRtDoyDSGmL1nF+Cf2OS8Chz2xENm+qGXy1Uy85Gk LNwscX7QC2XgQmbocKGLj/FSjKViq+fFKit27oYJi8gJytaUSSueOlGZlDvNXg== 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 9BCE2112E3; Mon, 21 Feb 2022 13:48:48 +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 21LDmmha091773; Mon, 21 Feb 2022 13:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LDmmPx091772; Mon, 21 Feb 2022 13:48:48 GMT (envelope-from git) Date: Mon, 21 Feb 2022 13:48:48 GMT Message-Id: <202202211348.21LDmmPx091772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 26105b4c13a0 - stable/13 - linux(4): make arch_prctl(2) support GET_CET_STATUS, report unknown codes 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 26105b4c13a0a810d5120e3a14e9e110b792cbc4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645451329; 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=Rh0MAYVj1ECT4rmDMCiJhAeWl25JCGyDKZlJdFnOZ04=; b=qYIquDQakhdNLDbFdHnGTYy00h84pRJJS/82gVtb/7ec6dgqIePy0AV1vx7lNTJJlg/m3O IYEN6ZmgF8ugRc3I8Sdtpg4R1pl8AX8Fvy9JdGCeskBrbmz9Y8Ro16B9PGjULMqudpBDbL 44QxRMAFaXleE5F2gNI8MftG687auPI99hOS/AHygyHrHvMDzFdeQ4R/z559RVxwJeeHn+ hLHHkdAevNVgHn8W7/Pqb6/6et9oGAVb15WueRgisyqGYgw+GmnEMUFIcI9U5TiCG4tN8t uVL/cFr4iL7Mqms8iiQGOk2UvBAXO1rZbI8tMII2uawhUdorWAiAjse+MZKxyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645451329; a=rsa-sha256; cv=none; b=lVQ9IVH/gWNeHon4bglMydRCUxeSPr3FQxY+aePTEeUe3wcLoVJKnPoxewOyCjlEzJtnJv wlUtR65V45yet/K0/rSZ2/bHbqjFO+5OQIlGg58+us/+5goyAmAhcp9Y5mWmX7UHS8R/7G 4C25ZbtZOcwwpPiGi/B8vZJSTs/DfQknXHI/q//yY3O0vegT0A7ZthybVZjMEveLcaylM1 TFDMM/jGpHIxoDJE1O2blDdMj24u4GvxuVPkByTWN0GvCPNA3YNTACa2NA8xfZ+Wr/mkTb qUq+eFaNnTSDsxGxwgyJCy6WjLIpKjtvg5cxn9gHZbH7lleGEKTkRBp5Wol0dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=26105b4c13a0a810d5120e3a14e9e110b792cbc4 commit 26105b4c13a0a810d5120e3a14e9e110b792cbc4 Author: Edward Tomasz Napierala AuthorDate: 2021-05-06 08:33:35 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-21 12:44:26 +0000 linux(4): make arch_prctl(2) support GET_CET_STATUS, report unknown codes This is largely a no-op, to make future debugging slightly easier. Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30035 (cherry picked from commit 916f3dba4523d1b2d478538875d45df56b20bcdb) --- sys/amd64/linux/linux.h | 1 + sys/amd64/linux/linux_machdep.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/sys/amd64/linux/linux.h b/sys/amd64/linux/linux.h index cf9f5cccb287..dc4986817d11 100644 --- a/sys/amd64/linux/linux.h +++ b/sys/amd64/linux/linux.h @@ -431,6 +431,7 @@ struct l_pollfd { #define LINUX_ARCH_SET_FS 0x1002 #define LINUX_ARCH_GET_FS 0x1003 #define LINUX_ARCH_GET_GS 0x1004 +#define LINUX_ARCH_CET_STATUS 0x3001 #define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r)) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 6c9f63b3a21c..c19d80b3b9a7 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -221,6 +221,7 @@ linux_sigaltstack(struct thread *td, struct linux_sigaltstack_args *uap) int linux_arch_prctl(struct thread *td, struct linux_arch_prctl_args *args) { + unsigned long long cet[3]; struct pcb *pcb; int error; @@ -254,7 +255,12 @@ linux_arch_prctl(struct thread *td, struct linux_arch_prctl_args *args) error = copyout(&pcb->pcb_gsbase, PTRIN(args->addr), sizeof(args->addr)); break; + case LINUX_ARCH_CET_STATUS: + memset(cet, 0, sizeof(cet)); + error = copyout(&cet, PTRIN(args->addr), sizeof(cet)); + break; default: + linux_msg(td, "unsupported arch_prctl code %#x", args->code); error = EINVAL; } return (error);