From nobody Sat Nov 9 00:12:58 2024 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 4Xlbqb2WPGz5d1Jy; Sat, 09 Nov 2024 00:12:59 +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 4Xlbqb0jgBz4ZJc; Sat, 9 Nov 2024 00:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731111179; 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=oL4c9zqUiharGLtO8GQo/PY0TSi3V+UvgKZcTOlcxQM=; b=NWAGzT2VHEUbBtKexbybLpS5pRAr6t3NqgOyvykAN5A/e1UKh5VyQlJjkfKjzF+R507c8z wl8HzmkOrGsKDcg7+Zw0FulW7gBPeylcU04j72Ih+7yy36LGvKWUpTjf1d2tmkHwVBRY+l 6YiXmLLoWeKen1i7GPL3Ekl2XKECiPIyQqIIYxqEgbey00jp2yC4lWTadSye1m9HqtYjMT LJHjmf6V5i5HNt/mruQLVRcXwTIasxXTjPOx0qkH43Y8hvuymMgs0AXQjEd4dO/gTfrgOS X7YuI0gu+woCyRjo6JezXJxkNviezw84eAQQROfoa7KRec0ntiDXZzERXn+/Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731111179; 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=oL4c9zqUiharGLtO8GQo/PY0TSi3V+UvgKZcTOlcxQM=; b=XFUphcTYL+W+K8LAkUfdF8fFKChBB3+8eoR74PhFexWSztUdPoJfZuAkYXJ0rgMQUCZOdK RqQDTBf6Jldilg/XoSFqY/ZL/AF17+YdWLEvfBPYZG63tWMRcDS0GwK15EB/w7WM9v2XZB Qy+VMnpKI5Oxz1A2HYbJxxTj3lDfpBEKF3OwEWxoRfDMxtZm0aV4Gmb4oeb97b6OnwK/UF vKDj3KdjKEi498Tc+bmwg21NW5D497YtLAR/Iu3MuzMeq4Oi8wjBlZ3U1WA+zjAztAmI8P SxehTMrSUej0wIjjLuBzLA39i3yx6ydLy2h3qyYLPewcArWT6CfQx+I68GHX2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731111179; a=rsa-sha256; cv=none; b=V90FZXPxGznDCkHhL39xw7PEFqA7uyuL7pwBSdv7eCftSGYIwCERPBqSY2kg9WyVjvtnMk pv34QL+6pUD9Y/9I8HgQDlmQfQRhWxPsXh8vTEj7yt4lJPonDswkQZvo8zLbTW97BkECLS Dt2qoP86JcFhv50d1vHDi0V+fsuRIISOz6o7NFIMybYfFwjgpsiU63+X1/dC6e/SdjXGmy ARH950FIWpkLU8Pbgp6Vt2cll+G/Dxu0zGtASbWB2Z8AvmVrCyKGTTbs9qZvNBzM7cHGKg 2mjyYXmGyLQf/9aNkaDTHS15bfv9Dxo8JgV3KfB+fXNxcvWZNTfnSOljiZ3MrQ== 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 4Xlbqb0KQ2zrRf; Sat, 9 Nov 2024 00:12:59 +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 4A90Cw0V003903; Sat, 9 Nov 2024 00:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A90CwwZ003900; Sat, 9 Nov 2024 00:12:58 GMT (envelope-from git) Date: Sat, 9 Nov 2024 00:12:58 GMT Message-Id: <202411090012.4A90CwwZ003900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: f239981ed58c - main - proc_rwmem check PRIV_PROC_MEM_WRITE when writing 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f239981ed58ca632d4dba39b2229c3152dd32a15 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f239981ed58ca632d4dba39b2229c3152dd32a15 commit f239981ed58ca632d4dba39b2229c3152dd32a15 Author: Simon J. Gerraty AuthorDate: 2024-11-09 00:11:12 +0000 Commit: Simon J. Gerraty CommitDate: 2024-11-09 00:11:33 +0000 proc_rwmem check PRIV_PROC_MEM_WRITE when writing This will fail when mac_veriexec is enforced. Move the check from procfs_doprocmem to proc_rwmem to ensure all cases are covered. Reviewed by: olce, markj Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D47484 --- sys/fs/procfs/procfs_mem.c | 2 -- sys/kern/sys_process.c | 6 ++++++ sys/sys/priv.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 159b40785172..0020b8f8a8d8 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -62,8 +62,6 @@ procfs_doprocmem(PFS_FILL_ARGS) PROC_LOCK(p); error = p_candebug(td, p); - if (error == 0 && uio->uio_rw == UIO_WRITE) - error = priv_check(td, PRIV_PROC_MEM_WRITE); PROC_UNLOCK(p); if (error == 0) error = proc_rwmem(p, uio); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index a3a7a22f4cd3..fe2e112dbcfa 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -361,6 +361,12 @@ proc_rwmem(struct proc *p, struct uio *uio) reqprot = writing ? VM_PROT_COPY | VM_PROT_READ : VM_PROT_READ; fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; + if (writing) { + error = priv_check_cred(p->p_ucred, PRIV_PROC_MEM_WRITE); + if (error) + return (error); + } + /* * Only map in one page at a time. We don't have to, but it * makes things easier. This way is trivial - right? diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 5e14fee2cce1..864fb5b9cdea 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -515,7 +515,7 @@ */ #define PRIV_KMEM_READ 680 /* Open mem/kmem for reading. */ #define PRIV_KMEM_WRITE 681 /* Open mem/kmem for writing. */ -#define PRIV_PROC_MEM_WRITE 682 /* Open /proc//mem for writing. */ +#define PRIV_PROC_MEM_WRITE 682 /* Writes via proc_rwmem */ /* * Kernel debugger privileges.