From nobody Thu Jul 16 16:25:09 2026 X-Original-To: dev-commits-src-main@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 4h1JKy2cqyz6lZrv for ; Thu, 16 Jul 2026 16:25:10 +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 4h1JKy24FGz3LtR for ; Thu, 16 Jul 2026 16:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784219110; 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=Sk6ViTi2nEV3QvmPQeLqlYVglAie8WvehU+z3Fhebzj628kGH+jeH29QOrPYatIcT6nwoF X+G5fMoN7rCFa/ZEIwt/TQHs2XJB2SoQgE8093U6RjAtE4EKD7l1i0iebU4USBcCOkykFs iwFj+V0+fT0T0h7mvfHIo35jek+O2yNGNsdJEjtOkQ8z7hJdRUKeSiBJC+ML/fHjcHUdc3 TsE0rx0nJPtUQ+wa0vPGCInKUy+doRwae2imALX2I9oUtds/kIO9ZwXbZr8e36d1M/6v/M hbwyrP80jAonfLkuCJGrzF5jD0v2LyC50IKUa2JEWCLdIRCrmmjjsBLoLQlTUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784219110; a=rsa-sha256; cv=none; b=a+stozer4Fx8O/rSsOH7tg06j413+Cag4ygG8PcjkXlfEVanjKv3sg3/+q2CEKrUCkigyZ 52HT7Zvdi48o5GZXNQn9qPfKEJo78m5KQkahhWgRXvIOLMezJPkbmP7BMBLl7fz6/+CZ6q obiT6I2U/XkpIFRpTmtVs8n/vmvnry07ciecxlQgPyvAI9Isgt5gPo6cOljTAAPZYUMFzf DfbhwjkPcQh/DaKOcof82M+wgQNGadyMSMirfAKG+UqtPm9HrJQ8rpAn9LSsXb0ctd8GdW caxz0t+iZz/OJFVCOAilK17qQ1QaY3MfpT780k2S4Tge0Ex3fLXjY/ourhktsA== 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=1784219110; 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=RZtviAV0VXLSM2Ga0Ey88Szd/2F/zBhz33NUTqYYqJh24PS/eF+5BGHUmmT0wG9fL5LxEt QFYGRCxBlKeRIDuPgsEpV9uF4xPf6sFF/OhxS9sBqZSvO/6zx22vtqvWRHYcImGbawNQVv UGm8R7xOhyOG41eptkaILOwiKOyP0DZpm1WpOAz9SLJQPVkX01SyforsxO2wjSauwUEBfO miZN4FSuO2GteoCn1JmW5pKptVruZXxSlWAoxtl1bfsWS+V0fxHJWBcN3E5ckhkQQAGY0S c2DBj6/5S6oqliJm3Hig/7zo2f7N90DA1Ez5/Fb45hfydseKjzdScSJFyKSRWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h1JKy0QBPz1N4h for ; Thu, 16 Jul 2026 16:25:10 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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"