From nobody Thu Jul 7 18:14:00 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 B675D8D5E94; Thu, 7 Jul 2022 18:14:00 +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 4Lf4L04qLSz3rLP; Thu, 7 Jul 2022 18:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657217640; 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=r/ZwvVrMiy9bgIyE8H/nyfJ2iGOMlkuLkbvFvxi7wZo=; b=nrrKNmyhGTkTqUH9d0cgB1RXy2OT+FMYNFM7FHufi0f88/w+5UdJ6xctsWi27QKGH3nDoO Ad5RciKoCPdYVggJ7RDw1al4+Y6s1go7V9ff8FMxZdadLHwG+jj5hzpn1v67XzjDZRFk7Q pKzExwWS1nzhe3WX0sgGVSTfCQOwk+ra4q0rLkaVsLt4Je90LanteezJknx/u8HYzkDELg Q9pE9YkPuwX/0FArPhZxr9it4FUiW4TwpFYBN0sk4swVkBnAstJC3iKUAXbmziTNNBJDpC TzHDd49dNpps38n3Eza5cGzDmEblrlKIfbfW5I5Z/r/YtsUFTN22JvtVXYpyuw== 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 4Lf4L03whNzsYT; Thu, 7 Jul 2022 18:14:00 +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 267IE05b038500; Thu, 7 Jul 2022 18:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267IE0rG038499; Thu, 7 Jul 2022 18:14:00 GMT (envelope-from git) Date: Thu, 7 Jul 2022 18:14:00 GMT Message-Id: <202207071814.267IE0rG038499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c54008fe2a3b - stable/12 - rc.subr: use _pidcmd to determine pid for protect 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c54008fe2a3b9dbb1cf9e443f38593228242918b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657217640; 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=r/ZwvVrMiy9bgIyE8H/nyfJ2iGOMlkuLkbvFvxi7wZo=; b=mCVv6pVU8sNcwOqDVuVC1HRLIZS7ZyoKF8RWvk6xrjfTfclszpRTa+JlUvnOfJQaycsIOx GGedtO68o352YdEpAc4SRF5xRZZhhj/+Z4640xq34c1v39BYHEPdWS7+7Wbbh1nJtBgJTU R/2ybccOBhrMze787fXcdXDcFIh966jHdtmd8mfhBdBtdBWtYrfZwhht3GBYMP+Y8lSQCy vxPC3KOzMh1N6GIiomMPMqob5w0GwJx/ZIsUGrimJHuC0Vs5lQVqGk3G2hwg2pawftLr8C TxJn2J5Xsg3lee37rKdGGd5BOdX55jKYbVesaMwboUzaxuGYo5uMHmiD8g/6Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657217640; a=rsa-sha256; cv=none; b=Qnv9KuIASHMKmbtirshrIucL2sWVepKMlbe02wq+KoZPTn63TgDKCc7yoZMJpbb1IYv/G3 UKAk8gz6/M+ErDeiTAI+K7c/TpBaheNHkW+FmnaipV9FzwBCf9xgKzOV+pcFVFME7jLrDY K8CuuhtJvueRx94zYhvrsIvatRVtUQWxDBBVKL0+nauG5nXKUHnley13vTJzF+X1Iqh70Z 9OCKMg7foMyl3btaS1LwSo21TZQ+HcbQKNlZro3mR5caQh+oEn9AwbfbNcRMa5odWhi8MY yZYueWsvJVNKg6h8O+vvRtr388bu3dlyrLZSmYUePonHIJJHZ/949WlKLdEUEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=c54008fe2a3b9dbb1cf9e443f38593228242918b commit c54008fe2a3b9dbb1cf9e443f38593228242918b Author: Mariusz Zaborski AuthorDate: 2021-06-24 18:14:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-07 18:13:24 +0000 rc.subr: use _pidcmd to determine pid for protect This is a more reliable method that accounts for existing pidfiles, procname and interpreter settings. Current method of obtaining the pid for oomprotect="YES"|"ALL" processes in certain cases fails to find a unique pid. One such case are rc.d scripts defining command as: command="daemon" which results in all processes started via daemon being selected and passed to protect(1) which fails and prints usage: $ /etc/rc.d/exampled restart Stopping exampled. Starting exampled. usage: protect [-i] command protect [-cdi] -g pgrp | -p pid Running the same with -x reveals what happens: + pid='3051 4268 4390 4421 4427 4470 4588 4733 4740 4870 4949 4954 4979 5835 5866 55487 55583 56525 57643 57789 57882 58072 58167 99419' + /usr/bin/protect -p 3051 4268 4390 4421 4427 4470 4588 4733 4740 4870 4949 4954 4979 5835 5866 55487 55583 56525 57643 57789 57882 58072 58167 99419 usage: protect [-i] command protect [-cdi] -g pgrp | -p pid We have a more reliable way of obtaining pid already defined in rc.subr and available when protect(1) needs it. We can simply `eval $_pidcmd` which also invokes `check_process` but properly accounts for existing pidfile, procname and interpreter settings. With the change the pidfile is properly obtained. Submitted by: Adam Wolk Sponsored by: Fudo Security Differential Revision: https://reviews.freebsd.org/D30367 Approved by: oshogbo (cherry picked from commit 6ba108e52d175b6833437c8627ae5d0546a4e102) --- libexec/rc/rc.subr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index d2a980e94ab1..77b26614fd11 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1260,13 +1260,13 @@ $command $rc_flags $command_args" # We cannot use protect(1) inside jails. if [ -n "$_oomprotect" ] && [ -f "${PROTECT}" ] && [ "$(sysctl -n security.jail.jailed)" -eq 0 ]; then - pid=$(check_process $command) + [ -z "${rc_pid}" ] && eval $_pidcmd case $_oomprotect in [Aa][Ll][Ll]) - ${PROTECT} -i -p ${pid} + ${PROTECT} -i -p ${rc_pid} ;; [Yy][Ee][Ss]) - ${PROTECT} -p ${pid} + ${PROTECT} -p ${rc_pid} ;; esac fi