From nobody Fri Sep 04 05:58:33 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 4hbm3t2yr6z6r6vF for ; Fri, 04 Sep 2026 05:58:34 +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 4hbm3t17FQz3XVB for ; Fri, 04 Sep 2026 05:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788501514; 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=5P4FOlcK2fzPuWyyYTaxlFLZJ5keyLNUfFUUvXUjJkU=; b=lVfLEyGLZpTJRqIx4JNwiC71FKQV1IIHVzWc5mQQwoRnq6Xw4Q99rDb0CqmYVOZI8iPuaM XpQ2H0yfcxsFpuzoxxk1CcVLqMQnJUPz1Eamhc2YI5vQkIx0v4YT0DvvkYPSQD/ZyzNfHq uKsZ4ooQSSXDmGZpCuuOZTz/AB/v6GT34SwV5CSMuTIsOC0zBpWAo5Krd/K/Gg9LEp4wtI kTd6uXgON8ME7R+OFsUuaU1fQ+XFICrR1J9p5CdgQ9PVykf9ML7hBZeL1xIg6M3XMNNvoj fJCLfujkM0D04XNLnnO9Y2+I9rIGLArB294+fiPBhDHGnXt30jWP4R6BHSFSWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788501514; a=rsa-sha256; cv=none; b=vOjzslTLeppTK6q1G8lpRnJZ8q+u9iiL8kn8DQls7elmMkKCTluht9U5ZUfOo0S9s/ZqBQ GtWPBnqwmFaCyet+sl7El313nqm8tY0czpQPoP50djNIc+QlQ5K3O8/saqaDUSv00KJ/Oq EIYuLMJi3GulAP2snZlrd+gvXkZOMLCTmeMob1kcpHRXo+l5zUQ0tW693CsOTlu+rOWoIv XUkXNK2UbOlHEezvYdxTAfDVBzmE7FkqBQdehJQNiDLlAH9a+l4VAiZkK88mqeNLOqkX1F N2/VBYK9SQ4Odl6/nsLpKPg4XJlTwwK4RV7ybM/C4V9jDCT7GsPtSmxZ3VeWlg== 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=1788501514; 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=5P4FOlcK2fzPuWyyYTaxlFLZJ5keyLNUfFUUvXUjJkU=; b=XvVX3pvi//pyJmnexbXOPIAIetOmmZwFj6IEtcBoLSoqvXqOiYVI6FKE51xXJH67yy0b0L 9z9YTed3jTO5jwYwuoEJAdQOxjc7+DBv1p133RkqcmQpZDaoZeIl98+sNUJZ6WTR0na/+D tkNl9zB+26BiluUvgXR9/DAhz4retDTZ/w2Gw9GV9rhI91rtab/Gs53Mv7UM33wXBcfIMn Qo33nOPDlSi4i+pUQv9frBPZnG9zOPNlJqHFXrSiq9Aysm1AG3DGRPQY8VJcHlR0bc9jO4 5ppvY5LnP3st/hbi8aPL1P5R1hDhfRQpqn1gIQR/Cof8eQa5QLSwPPsvpShXRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hbm3s6mC8zmrp for ; Fri, 04 Sep 2026 05:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ecf7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 04 Sep 2026 05:58:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 46c155b1a310 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 46c155b1a3108f9f6afbfc053c072b190088497a Auto-Submitted: auto-generated Date: Fri, 04 Sep 2026 05:58:33 +0000 Message-Id: <6a9a5e09.1ecf7.f918257@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=46c155b1a3108f9f6afbfc053c072b190088497a commit 46c155b1a3108f9f6afbfc053c072b190088497a Author: Enji Cooper AuthorDate: 2026-07-16 16:24:54 +0000 Commit: Enji Cooper CommitDate: 2026-09-04 05:58:27 +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 | 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"