From nobody Thu Jul 16 16:25:09 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 4h1JL323g1z6lZrx for ; Thu, 16 Jul 2026 16:25:15 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h1JL31XB4z3LNV for ; Thu, 16 Jul 2026 16:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784219115; 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=VEScrURjmeuIsvuUB706JeAJn9lhlRiqLlRD1ZnSxpQ=; b=kNAjDaqu7KYnVX1EQsZN5Ds7oOS3ecs3FRLt+1w5G74V/SzeBEqnQaWNwDTS9JQorJo5xN KuhO3xn4bT3RYDBg/OSp8hpWLsZbBiSD314v2dMM5GCaCvePOtxvNiVkmOhjQm/9dSr29e H5qM5cdXnVeRlCX3IbTpNlneH6ad1OOOxF9SWiepl3igfHPz3/Nz+nXnlGMO2vpuAlX1wd P94daXiK3MhI24paWYUyGhxnbPsKGjnJrTpEVhLQapc7EYKjtHjTKfz3BdT+SSjnGkb46M etpWaSaHD5T1dWzAQQokIFy7bdLiDb9mijqXENGbui2txo7UvNDWVlWzk1DALg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784219115; a=rsa-sha256; cv=none; b=ONoF+L8n0AynRBVDNuZNYHRdijtRrOPNpJactPD+cV3LkcPhPkqmBYb7f74mc5e+l9XN1d l5N1Fjn3yn1IneeJQwbOoobQYhD3ENXzV/6cT4pzuJvf4VCueIMT3dyebXTeLaYqaGhHXP 88iCxGn0RQCRi9Uhxu+hI53eshB3nRfEhfrlfKHoDaROKRPg5yRFiNjJ6CCjbcM/KOPfwe ybyziuKJ8VEAW0H06OSMxnXtQ5zf5PzMafrvjvm146XaQAUhC3D/AgSRkcMJT61jJDm/57 36yUhoJwWExVcHghKYMH7o3eSatxa6DxZlBGgXBgOp//4blaVHgkDL4TtOnJfQ== 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=1784219115; 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=VEScrURjmeuIsvuUB706JeAJn9lhlRiqLlRD1ZnSxpQ=; b=yIYIlOm4y4PH9GwmKu6Fg57GW4LdlO8IYOaXTiFlpsF4byMCfisPzcECZYM4lGSC9cOwu+ IM3PMlFZl+c9lpwDL6xg1QVRtOiGOK/5X9kDHe0fLJy2Px5PnUbYRyUlISqA0A2ClA/cCU 2C3nqbha5qVy7s6ZXklt+w3kFi6Ayh2/h9eEEduLZ6+Ey11rs8lQvwHyU17u+vJyELG5Km kk2d4DOV5sppZqbY9q6lJG+SHEtORF+OjhaCWBR5YqWGjKgtfzcnlo4cIZh4cDspf3zeZ8 xW8DlivV1WiNvk1T+/C8Q8cqhW9+6u8F8LfMC3n6AzaEaZ2gkFm4JE4ukn5QfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h1JL300HFz1NhR for ; Thu, 16 Jul 2026 16:25:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2319f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Jul 2026 16:25:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: fc186c24b1e7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: fc186c24b1e72fa3eba91c166f7a554a5cea5828 Auto-Submitted: auto-generated Date: Thu, 16 Jul 2026 16:25:09 +0000 Message-Id: <6a5905e5.2319f.4e4427b3@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=fc186c24b1e72fa3eba91c166f7a554a5cea5828 commit fc186c24b1e72fa3eba91c166f7a554a5cea5828 Author: Enji Cooper AuthorDate: 2026-07-16 16:24:54 +0000 Commit: Enji Cooper CommitDate: 2026-07-16 16:25:03 +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 --- libexec/rc/rc.d/dumpon | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/dumpon b/libexec/rc/rc.d/dumpon index 0dfcdb266b20..784187e54bb3 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,7 +99,7 @@ dumpon_stop() esac } -load_rc_config $name +load_rc_config "$name" # doesn't make sense to run in a svcj: config setting dumpon_svcj="NO"