From nobody Sun Jun 28 18:40:57 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 4gpJBx6yPPz6jl1h for ; Sun, 28 Jun 2026 18:40:57 +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 4gpJBx4qmhz3YPc for ; Sun, 28 Jun 2026 18:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672057; 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=bNrqow6nVRYKHzb0OzLxbxFZrZcp8Fi1YtH9diIluWE=; b=t+FEHnb7phGVUKzRZLddaUP9zscVlhrcaa/iE0jsS4g1WsTsvqxVkqIjR1wVdmuW5vagOP DjIDEVQrPssyHFR+3ltDwlz6ih5aBz1kJACj6+alubvysZcvTG4UDdZhKs5f1zaZG/yPDg 96d+ZhS6QE+9UWpRdu2lOdo1kVhQqR5ARgl+vt+FkJ6NcTEMoi5LUlPsZGOVtr+pdnwIRI PcAGB4SuYeBLu7gU709krviuX/XMidSQuWhNN5re3FnVOuTvnwxLdA3EeG//gXwhHsyUSB ybSOhecBUkdfZlH+m1voJ+Xb6+pcPB0rWewvjkWCYSEgqNeDnnxhAfgvFeUl0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672057; a=rsa-sha256; cv=none; b=CqTzXRCqjVqSxzMIFKZv1IEXh3FfB/4K/2pPi/Vb/tQge7sUrWoEwRJWmt0JNGgJwyIQtu lF816pDLICi0DerfYjQ7ngmPMXU9l+BxQzcoVJvs5tiE8Y94l3Ju5MJNdeWoRs3FEgSnxP 1EYJucCBLXRqzJYfA+b+aofCr0AZ8LT78Os8GgRvOx8VHzFZ7kacpfOhRMxH0T/H22OfuN oF11E29sy+niIPpY5hVXLeeyllye76CfTW3N5InSlOWvN25R+g463a29DDtnTKyXVV8tMO jdCgYvmgtMSbhh8b9MN1XpAqaSIMsRQ1J4te21DzhvmB22SFIou4olIyGwAZCQ== 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=1782672057; 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=bNrqow6nVRYKHzb0OzLxbxFZrZcp8Fi1YtH9diIluWE=; b=dgHNGDIbAxBGqvohCsgUoZETHvyjbaVZtJ1oaZwJKGZbsV36UDApBKT2pYpU8m4tI6Td1U AD1y21Kg8bNpQitzJYpRjEaJ3J3JulDOij1KlSOIbaz9fpZwZyCCOBOJsm8AeoKqBJaL9B Nu9EW4ScSJ/JG5ytkx42hj1yTnK5f60ya3haDTwqgLVdlTUn2VepqbNiNgMvuVmLKFBvj2 nXmsWxQZ7spQcy2iOOR18TUjPEXCXQ1HdGKXhYaHaakLBDLcNieAELbi8Ctx0qjQpQHE3E UQo/HLL3iQYggc0q1s61xIMlb2U5Y3GGjnhl5HvWQ9HjKf6uYVXQVzq/W8foVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBx3p1Wz6p1 for ; Sun, 28 Jun 2026 18:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 1561d31aa0f9 - stable/15 - nuageinit: fix shell injection in power_state_change delay and add test 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1561d31aa0f9fe1b44be855c12fc15cf92b95983 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:57 +0000 Message-Id: <6a416ab9.1c5db.6fdf3e8c@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1561d31aa0f9fe1b44be855c12fc15cf92b95983 commit 1561d31aa0f9fe1b44be855c12fc15cf92b95983 Author: Baptiste Daroussin AuthorDate: 2026-06-09 14:19:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: fix shell injection in power_state_change delay and add test (cherry picked from commit 09d068e52722dee0ed65eb88c5ea5bff4bb2ba06) --- libexec/nuageinit/nuageinit | 2 +- libexec/nuageinit/tests/nuageinit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 6e900e01df4e..8ca1a2c558c8 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -748,7 +748,7 @@ local function power_state_change(obj) end -- Build shutdown command - local cmd = "shutdown -" .. flag .. " " .. delay + local cmd = "shutdown -" .. flag .. " " .. nuage.shell_escape(delay) if message then cmd = cmd .. " " .. nuage.shell_escape(message) end diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index ce574a350ecc..ab9e697076e1 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1332,7 +1332,7 @@ power_state: timeout: 30 condition: true EOF - atf_check -o inline:"shutdown -r +5 'Rebooting after configuration is complete'\n" \ + atf_check -o inline:"shutdown -r '+5' 'Rebooting after configuration is complete'\n" \ /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet true }