From nobody Thu May 07 03:49:25 2026 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 4g9ytF50Qqz6dN4j for ; Thu, 07 May 2026 03:49:25 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9ytF2YjBz3m9L for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125765; 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=6juM/HYZgK9+5ROShR0VfGcJaMc769jlzqS+CnKABOE=; b=qAexpquYJiJt4w7uJ+SiTsF3kz4SQW/JNdQ4NFyHyzRxJPBBuK0xlsG2lNcRohD5P5KNO3 Ihno4XQHdsUKBWuE/mAIqXWaLKepKxl73iH8BAF6wVeRE0UjLuOUOgedYJ/KfJWNeSs4et E2uPcs8GYlZqxPMxyVo8dNRy7qawwi8VijR0n1b0dTLtkFk/6v7ZZjWluwP5kld9BO2roH CsSSEOCAD+ZjFVhMuQGC+CJz8PJbNEkoTxhiyHQzAykOdqbuYbV+JBTdXXfO3Shv9C5YG3 JPGcNCO7Ws0rdxpi9hWE17/NYhUPnSDLZKPCCPG0GRAIDOTBVnqeySrpFfuRPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778125765; a=rsa-sha256; cv=none; b=HTL3E+O5p5G2ATGYUpEXCG5QY73gcuUGyJm/KXoYb60YLMGt8GTDQzjXEUJ0k3Uq5s+Fym hXCg5f8bWWNZJhGPfrF4OQKSEISdOkK8rhliFFiwQn05EjjR/JfSy9AR6UMnpcqBLQIQH7 XNViQdt/zUjJXkg9RpkZQt5/zzm7aX0i/SZOQSs94OIC/jkzWYZbbu3qsz4mphe+6Xx43B sLQZ33pZPsXzAXgdjRR41RL7leI/RVUdceZzmzAZkD02wv+i09BTaHW4eYP3h8r/9Zt70b Ko1CSLKqItY49adCGPImbSOETJK1Bjtptk2KT6JClSaY0IIlQX6fYA1MARqlxg== 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=1778125765; 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=6juM/HYZgK9+5ROShR0VfGcJaMc769jlzqS+CnKABOE=; b=nmosQ94fUItLaLxESdxIlkAZaP7jouO7HtqWj4qzA9H5ElbTMqL82N7Ybllr+4CvRlWVwW IbifK7daiJrwcQfFk9PFdLTma3CvSg0j9MDCe5kx4kB9BHnSeW6E3FskyK0QA28x+l9hHV lM9eEW2ByZIRErmVJhTbDdJwwDF7KruArgEWoP8GfkC8y7vK5bmP4XjIYUXn92FqgoeNEv a4biCJU+HyxHMPwpzY17VK41lHXtUUnD7NXS01N0XF6I5cKfd+N4tIEOkRWKq5XW1IgvV2 uQBMlDhsakNKFsHillIg1zAACbCHdjM8WbgR04sTHQCzBURUhsQ3rRMl4oBb0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ytF1tfTz173C for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 03:49:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 586838724e40 - main - Remove PROC_CHECK_PRIV macro from sys_process.c 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 586838724e4086016ad62f0914248fc58ce26e35 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 03:49:25 +0000 Message-Id: <69fc0bc5.25fab.7a87e5e5@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=586838724e4086016ad62f0914248fc58ce26e35 commit 586838724e4086016ad62f0914248fc58ce26e35 Author: Simon J. Gerraty AuthorDate: 2026-05-07 03:49:06 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-07 03:49:06 +0000 Remove PROC_CHECK_PRIV macro from sys_process.c Just put the priv_check calls in the code. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56864 --- sys/kern/sys_process.c | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 487dc5d06614..dece6457a4bf 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -72,13 +72,6 @@ /* Assert it's safe to unlock a process, e.g. to allocate working memory */ #define PROC_ASSERT_TRACEREQ(p) MPASS(((p)->p_flag2 & P2_PTRACEREQ) != 0) -#define PROC_PRIV_CHECK(priv) do { \ - int _error; \ - _error = priv_check(curthread, priv); \ - if (_error) \ - return (_error); \ - } while (0) - /* * Functions implemented below: * @@ -115,8 +108,12 @@ proc_read_regs(struct thread *td, struct reg *regs) int proc_write_regs(struct thread *td, struct reg *regs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_regs(td, regs)); } @@ -130,8 +127,12 @@ proc_read_dbregs(struct thread *td, struct dbreg *dbregs) int proc_write_dbregs(struct thread *td, struct dbreg *dbregs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_dbregs(td, dbregs)); } @@ -149,8 +150,12 @@ proc_read_fpregs(struct thread *td, struct fpreg *fpregs) int proc_write_fpregs(struct thread *td, struct fpreg *fpregs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_fpregs(td, fpregs)); } @@ -271,7 +276,9 @@ proc_write_regset(struct thread *td, int note, struct iovec *iov) if (regset->set == NULL) return (EINVAL); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); p = td->td_proc; @@ -305,8 +312,12 @@ proc_read_regs32(struct thread *td, struct reg32 *regs32) int proc_write_regs32(struct thread *td, struct reg32 *regs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_regs32(td, regs32)); } @@ -320,8 +331,12 @@ proc_read_dbregs32(struct thread *td, struct dbreg32 *dbregs32) int proc_write_dbregs32(struct thread *td, struct dbreg32 *dbregs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_dbregs32(td, dbregs32)); } @@ -335,8 +350,12 @@ proc_read_fpregs32(struct thread *td, struct fpreg32 *fpregs32) int proc_write_fpregs32(struct thread *td, struct fpreg32 *fpregs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_fpregs32(td, fpregs32)); } #endif @@ -378,7 +397,9 @@ proc_rwmem(struct proc *p, struct uio *uio) fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; if (writing) { - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); } /* @@ -710,11 +731,11 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) addr = uap->addr; break; } - if (error) + if (error != 0) return (error); error = kern_ptrace(td, uap->req, uap->pid, addr, uap->data); - if (error) + if (error != 0) return (error); switch (uap->req) { @@ -1250,7 +1271,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) CTR3(KTR_PTRACE, "PT_STEP: tid %d (pid %d), sig = %d", td2->td_tid, p->p_pid, data); error = ptrace_single_step(td2); - if (error) + if (error != 0) goto out; break; case PT_CONTINUE: @@ -1260,7 +1281,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) if (addr != (void *)1) { error = ptrace_set_pc(td2, (u_long)(uintfptr_t)addr); - if (error) + if (error != 0) goto out; td2->td_dbgflags |= TDB_USERWR; }