From nobody Fri Sep 04 05:58:19 2026 X-Original-To: dev-commits-src-branches@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 4hbm3j1Jknz6r6vB for ; Fri, 04 Sep 2026 05:58: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hbm3h5Pv8z3X4v for ; Fri, 04 Sep 2026 05:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788501504; 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=yfs6b05Ssv5SN1XHuT68JWdxbnRKg+pFRa+HkJXYiN8=; b=w1eQl8vCtHljPq9HWNlT70OoMawkeTeCvSLaxEG7n0GIan1PIKFU+gJzqt4zAb7vqIyjW8 DqnIXaoxJVjtdvHpYC0Cksr+4wtekRU8HpUF4hpiZOxEg4ub0FVlrw6VX81PZtAnGPzpyN nONwu/yx9TdflvsxcYEshhjVS1JA1j4Z8Gq9E//X55xUeH2smNyrJMqqNFQ7Awb10HzKYV WKZ2ON5EYRUp+vUiReSeYBR8BvH5Pi29NXi8myJik25cgdV9bOjVzR76puDPgy5WnzcE/H EwJF1kxx4FDmF0S8/7jkxz7VaI0wlJAwB0Lr7YaIZI2gqiuMAlJC+B5UiRcmwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788501504; a=rsa-sha256; cv=none; b=VeGU0lsnZ6BUmKgzDIySR+tECE8XNAyhMOonARTv9267Uo/VCT8oCSczeBxim/2SfpY6uc Wd1OwrURwwtVMf5uKYo606HLwX3j+vA8J/5T0nJGueHpQUzBjAHHnB7K0JS56/+4ybCR9r 9LOGvL1fL9gPAZQBfuh9fY8mh14LASbarwUG1NIVNDNIhP+AJKqFKJcABumYvLu48Zi/NK sS1d6pxl/+A79T+68IqmgYR5iL2XpO2XS8j54aeaP+uHdO0i3rw/orYCQldWFrvmYMq/2t nyoVNsKgzSUMGDPqF89zdftAeEPCbckmVlGDjqv3mierwgBKFsjhQNslQhVS5A== 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=1788501504; 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=yfs6b05Ssv5SN1XHuT68JWdxbnRKg+pFRa+HkJXYiN8=; b=vBGmbpp56TzIqY6nYaJEVhXxU6P4GRHsDjUeuOxa2SDcKZahKRGF8o7/o9so9oz4bTfm3q b0l1Fgmvm0U5jMDe2pJ3t3Y/nsGR8NE5lU7C0r1iUjVQhbO5NRCYE0fLTtVIEKCnQwIZcF 4hdczGsCIDMNn3kSVKFchZ4PGwqIJWC76S2FVb6A7Mt9a2/J72S6xLymQsXSKop1S635sj TKW75TRAIDoB/tdQ4q1GBwHUEGflnYByNEk9BxqLF5wfnCEL5V2yltdUwaTJTF7jCbyCi2 aYMaCxkeRTqzqHa85O1rvlECCh6xgEUs1LULb4ySLykUzd+cstksHgUfCO3BcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbm3h3wbrzmrn for ; Fri, 04 Sep 2026 05:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20548 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 05:58:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: b82d5062426d - stable/14 - rc.d/dumpon: minor hardening/tightening up List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b82d5062426dca5887d656ce729603b9626160f6 Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 05:58:19 +0000 Message-Id: <6a9a5dfb.20548.ec51072@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b82d5062426dca5887d656ce729603b9626160f6 commit b82d5062426dca5887d656ce729603b9626160f6 Author: Enji Cooper AuthorDate: 2026-07-16 16:24:54 +0000 Commit: Enji Cooper CommitDate: 2026-09-04 05:57:58 +0000 rc.d/dumpon: minor hardening/tightening up - Scope local variables properly to each function. - Quote variables that should be treated as single words. - Replace `${cmd}; if [ $? -eq 0 ]` with `if ${cmd}` for simplicity. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57899 (cherry picked from commit fc186c24b1e72fa3eba91c166f7a554a5cea5828) --- libexec/rc/rc.d/dumpon | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/dumpon b/libexec/rc/rc.d/dumpon index a6748711b796..52145548e5af 100755 --- a/libexec/rc/rc.d/dumpon +++ b/libexec/rc/rc.d/dumpon @@ -22,8 +22,7 @@ dumpon_try() warn "The dumppubkey variable is deprecated. Use dumpon_flags." flags="${flags} -k ${dumppubkey}" fi - /sbin/dumpon ${flags} "${1}" - if [ $? -eq 0 ]; then + if /sbin/dumpon ${flags} "${1}"; then # Make a symlink in devfs for savecore ln -fs "${1}" /dev/dumpdev return 0 @@ -34,11 +33,13 @@ dumpon_try() dumpon_warn_unencrypted() { + local flag + if [ -n "${dumppubkey}" ]; then return fi for flag in ${dumpon_flags}; do - if [ $flag = -k ]; then + if [ "$flag" = -k ]; then return fi done @@ -47,6 +48,8 @@ dumpon_warn_unencrypted() dumpon_start() { + local dev mp type more + # Enable dumpdev so that savecore can see it. Enable it # early so a crash early in the boot process can be caught. # @@ -60,7 +63,7 @@ dumpon_start() dumpon_try "${dev}" return $? fi - if [ -z ${dumpdev} ] ; then + if [ -z "${dumpdev}" ] ; then return fi while read dev mp type more ; do @@ -96,5 +99,6 @@ dumpon_stop() esac } -load_rc_config $name +load_rc_config "$name" + run_rc_command "$1"