From nobody Fri Sep 04 05:58:19 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 4hbm3b6h5Qz6r6rf for ; Fri, 04 Sep 2026 05:58:19 +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 4hbm3b5lVrz3X1x for ; Fri, 04 Sep 2026 05:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788501499; 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=ElNWkZ45QewTy4GkVzeTDX96VblNnx25fucjhjAmt2CtnOWMxWLgUOt1SfveQ10zQwhI6g oQSvPCwMuGhvFSqrDA71y6P8IuoOZDvSGhH4caGjtW8NHCZbbGtfw65fh+xQy+EgY0/7bv lc0AHqmDjdGmbiR1NWhQTChWynaoyIeB+gXcM0FNao1Iesf7JetbPIj1MEBB+OuCgIerc0 UCQ9Si0/7K5RPPCs2PWabJcVDzG0iMEiH8tdkQXgdzwF55CjWMlqV3UCbW1Sh5rPWbSWE4 DxNNSHorSBT8SZhmcQLb61yMyv6/0pOQG58ObnX/KKu+ER7BOfrgh7unCDLuew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788501499; a=rsa-sha256; cv=none; b=CtCZFl5d7pT3lWz63ekR4fcU5WsoOYHhC+iAE3Z+e74na0F+vrijMshwJa+aOsJz0XlgDC pBwU2nCpqawxxOqLux1vhLjZU07HpFVDqo19aoWEk9p/hDTI69di7Ky5svTbYrwo9YvDJY fGR0NGo3QujPuL0Csh3hFkjhZG0b1td0E0RfjmX5xATGd66wHhKnhTYrMqPevPCSAzI7bz fAQfuEHoQ4KbytMmgsbcX/GmFxA3ySc155uzTxdQ2bIedxOUC5sR2TXEAEbRzdCAUs/Ynj UbzxQLOS5Vwse8hqvUhd4d/tRzaYxv7WWbp36MQevLSFDF3SG8ltnw51xqA1yA== 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=1788501499; 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=xGN033DpboF+Stqgx/fQRhaHYkQIuBy7FBajUgwSh2JrYBw5BV3bMOEfJl+e47n3mM7Wks kgYROVctKUVxCqubcUJVKhVaKJjyvdwjHY0skLAIje7wLLQo1kRzDaUSJ1eH2DSsHGEoKf 6dM3yv1JRptl4jqMnMFMMP1aNJ/8kjxK5f1bHJsZqMEjn5x7Hhs8mDJeO2Y63dMnyLz7Jn KzV38YMVQu1g1Hzdzz2OE7nieFkqlMXBDxtm2DITv0nxmh3HDiGMu8vcRul1pJ0v9kDXBz 5CESHthEJjCYMxSVapq1zP6p4VIjavE1Jw3XMFpVCGIP+M4Zy6kSMck1JdneuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbm3b3s3sznMG for ; Fri, 04 Sep 2026 05:58:19 +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: 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: 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"