From nobody Tue Oct 19 20:04:47 2021 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 0FB7917F51EC; Tue, 19 Oct 2021 20:04: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 4HYl8H6hjkz4bF9; Tue, 19 Oct 2021 20:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A628D1A2D9; Tue, 19 Oct 2021 20:04:47 +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 19JK4lEe069893; Tue, 19 Oct 2021 20:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19JK4lJB069892; Tue, 19 Oct 2021 20:04:47 GMT (envelope-from git) Date: Tue, 19 Oct 2021 20:04:47 GMT Message-Id: <202110192004.19JK4lJB069892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 34f39a8c0e2a - main - procctl: convert PDEATHSIG_CTL/STATUS to regular kern_procctl_single() cases 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34f39a8c0e2a4100837eb406ae24a7d6a357d696 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=34f39a8c0e2a4100837eb406ae24a7d6a357d696 commit 34f39a8c0e2a4100837eb406ae24a7d6a357d696 Author: Konstantin Belousov AuthorDate: 2021-10-15 19:06:22 +0000 Commit: Konstantin Belousov CommitDate: 2021-10-19 20:04:34 +0000 procctl: convert PDEATHSIG_CTL/STATUS to regular kern_procctl_single() cases Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32513 --- sys/kern/kern_procctl.c | 114 +++++++++++++++++++++++++++++------------------- 1 file changed, 69 insertions(+), 45 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 613fabc4ca34..1e29429aacf2 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -656,55 +656,96 @@ wxmap_status(struct thread *td, struct proc *p, int *data) return (0); } +static int +pdeathsig_ctl(struct thread *td, struct proc *p, int data) +{ + if (p != td->td_proc || (data != 0 && !_SIG_VALID(data))) + return (EINVAL); + p->p_pdeathsig = data; + return (0); +} + +static int +pdeathsig_status(struct thread *td, struct proc *p, int *data) +{ + if (p != td->td_proc) + return (EINVAL); + *(int *)data = p->p_pdeathsig; + return (0); +} + struct procctl_cmd_info { int lock_tree; bool one_proc : 1; + bool esrch_is_einval : 1; }; static const struct procctl_cmd_info procctl_cmds_info[] = { [PROC_SPROTECT] = - { .lock_tree = SA_SLOCKED, .one_proc = false, }, + { .lock_tree = SA_SLOCKED, .one_proc = false, + .esrch_is_einval = false, }, [PROC_REAP_ACQUIRE] = - { .lock_tree = SA_XLOCKED, .one_proc = true, }, + { .lock_tree = SA_XLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_REAP_RELEASE] = - { .lock_tree = SA_XLOCKED, .one_proc = true, }, + { .lock_tree = SA_XLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_REAP_STATUS] = - { .lock_tree = SA_SLOCKED, .one_proc = true, }, + { .lock_tree = SA_SLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_REAP_GETPIDS] = - { .lock_tree = SA_SLOCKED, .one_proc = true, }, + { .lock_tree = SA_SLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_REAP_KILL] = - { .lock_tree = SA_SLOCKED, .one_proc = true, }, + { .lock_tree = SA_SLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_TRACE_CTL] = - { .lock_tree = SA_SLOCKED, .one_proc = false, }, + { .lock_tree = SA_SLOCKED, .one_proc = false, + .esrch_is_einval = false, }, [PROC_TRACE_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_TRAPCAP_CTL] = - { .lock_tree = SA_SLOCKED, .one_proc = false, }, + { .lock_tree = SA_SLOCKED, .one_proc = false, + .esrch_is_einval = false, }, [PROC_TRAPCAP_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_PDEATHSIG_CTL] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = true, }, [PROC_PDEATHSIG_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = true, }, [PROC_ASLR_CTL] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_ASLR_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_PROTMAX_CTL] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_PROTMAX_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_STACKGAP_CTL] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_STACKGAP_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_NO_NEW_PRIVS_CTL] = - { .lock_tree = SA_SLOCKED, .one_proc = true, }, + { .lock_tree = SA_SLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_NO_NEW_PRIVS_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_WXMAP_CTL] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, [PROC_WXMAP_STATUS] = - { .lock_tree = SA_UNLOCKED, .one_proc = true, }, + { .lock_tree = SA_UNLOCKED, .one_proc = true, + .esrch_is_einval = false, }, }; int @@ -845,6 +886,10 @@ kern_procctl_single(struct thread *td, struct proc *p, int com, void *data) return (trapcap_ctl(td, p, *(int *)data)); case PROC_TRAPCAP_STATUS: return (trapcap_status(td, p, data)); + case PROC_PDEATHSIG_CTL: + return (pdeathsig_ctl(td, p, *(int *)data)); + case PROC_PDEATHSIG_STATUS: + return (pdeathsig_status(td, p, data)); case PROC_NO_NEW_PRIVS_CTL: return (no_new_privs_ctl(td, p, *(int *)data)); case PROC_NO_NEW_PRIVS_STATUS: @@ -865,34 +910,12 @@ kern_procctl(struct thread *td, idtype_t idtype, id_t id, int com, void *data) struct proc *p; const struct procctl_cmd_info *cmd_info; int error, first_error, ok; - int signum; MPASS(com > 0 && com < nitems(procctl_cmds_info)); cmd_info = &procctl_cmds_info[com]; if (idtype != P_PID && cmd_info->one_proc) return (EINVAL); - switch (com) { - case PROC_PDEATHSIG_CTL: - signum = *(int *)data; - p = td->td_proc; - if ((id != 0 && id != p->p_pid) || - (signum != 0 && !_SIG_VALID(signum))) - return (EINVAL); - PROC_LOCK(p); - p->p_pdeathsig = signum; - PROC_UNLOCK(p); - return (0); - case PROC_PDEATHSIG_STATUS: - p = td->td_proc; - if (id != 0 && id != p->p_pid) - return (EINVAL); - PROC_LOCK(p); - *(int *)data = p->p_pdeathsig; - PROC_UNLOCK(p); - return (0); - } - switch (cmd_info->lock_tree) { case SA_XLOCKED: sx_xlock(&proctree_lock); @@ -911,7 +934,8 @@ kern_procctl(struct thread *td, idtype_t idtype, id_t id, int com, void *data) } else { p = pfind(id); if (p == NULL) { - error = ESRCH; + error = cmd_info->esrch_is_einval ? + EINVAL : ESRCH; break; } error = p_cansee(td, p);