From nobody Tue Nov 25 00:43:22 2025 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 4dFkSq1d4sz6J625 for ; Tue, 25 Nov 2025 00:43:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFkSp6Pzbz42pC for ; Tue, 25 Nov 2025 00:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764031402; 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=GTGz+pAIsWE3A3nL8OKQiKOURUwHvo2CxRTqrVbUYDM=; b=CBFxkp6JFPlLCsDS6Rs9V00RjXlgQCYzRZ+2ISLhcEmal6gVb5zx9yTWcZW4af2cILDTQd iDiN8ndjpKtzH0pn7sw73poLh+Zrxjh+BySUdG/+4De1gUL8WkHh0uLc0T9iQyJSRHT3jr yUMZTi/TY3MX/SiD08inEhcg40A4ShXAtOsGjohYRt5CFjOHz3FHRPkt+bJY7Zu++1ebI/ 7N0OXIxKxD/cm9Zm9TknQYWrBvfqzi9iyB4jzWPUqzD+bgNtWKu+/8e8Txc8pNcLTtksOB QX2eO2THyy+UyF2mQ3K+HK5NaI08379UszDFVXw/v4f53RAt2V7rLwCGX708Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764031402; 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=GTGz+pAIsWE3A3nL8OKQiKOURUwHvo2CxRTqrVbUYDM=; b=WfW8WDAdgKdMoNOtqVx4bbk4LWS+a6h93KqsTJWEvbHTJPkZf1mbO/4Y2dIZ1V/otTIhCl mJCmgs7q2jnNAkv8OT7KZSTztKi768dyidVryXxl8egjgECx3I4rKTbHZZ4ux+9/eE5uC6 lsUBSHvOifxNY5882LFUKX4Fy3TxnGemooPNAYEowNjkyP/Lv1TD4LjQQ2G1TKmhicT4HO uNpZCNERqX9umOuZlbISBXA1/9nPKX4X6AgGYDDcsb0x94KVJrRPyUN0myTLmhDLE4dF/N jXf2qFqF8fJ9bdHoTIp6PHWV/UUiWQdw+7PQxRzLqKXC3gY09PcfKQZIIJDkEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764031402; a=rsa-sha256; cv=none; b=eZvfAJjNa6e9qiFPTTAAIyGStidWqFY43jIBoK++GvQZEBFd+mT+lsU/sT1raloFFn2WLR PnCgplyZh71O+5fRp94JifV7OiCfV+4RZ+TnCOelxZibyozB7UWgBLPhQV+pe+bTPPjpju LuRn/fTn8yQjE11g87kw6UibkWC2BlSqU62lD9GH0bHLiSWYG6/DEO/OiSgFOax68IkLan xQsqLt4TrXybzfUU+utFG9gr1qR1xfaFVEMRx45Mw1OEGlZUYLk+HxvmJpOWRd6NsNSvEl K7wBSAXIwUZdYCzYQ+DZwTJbWIB6BD1frK994k8tE808qXY0OC6um69QH2M6kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFkSp600XzfHp for ; Tue, 25 Nov 2025 00:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2556a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 00:43:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 646c0a2fe646 - stable/14 - nuageinit: Add guards against empty user data 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 646c0a2fe64651dc6315ff4b0ed6ba00924ca080 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 00:43:22 +0000 Message-Id: <6924fbaa.2556a.5442e7b8@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=646c0a2fe64651dc6315ff4b0ed6ba00924ca080 commit 646c0a2fe64651dc6315ff4b0ed6ba00924ca080 Author: Jose Luis Duran AuthorDate: 2025-10-21 13:11:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-25 00:42:36 +0000 nuageinit: Add guards against empty user data Add guards against attempting to process a user data file with an empty first line or contents. PR: 290395 Reviewed by: bapt (earlier), dtxdf, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53239 (cherry picked from commit 57d25b6333523491ac7a3e869bd5d16127203eed) --- libexec/nuageinit/nuageinit | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 148f5b3b30cd..0870d6570d0e 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -662,8 +662,16 @@ if not f then os.exit(0) end local line = f:read("*l") +if not line or #string.gsub(line, "^%s*(.-)%s*$", "%1") == 0 then + f:close() + os.exit(0) +end if citype ~= "postnet" then local content = f:read("*a") + if not content or #string.gsub(content, "^%s*(.-)%s*$", "%1") == 0 then + f:close() + os.exit(0) + end nuage.mkdir_p(root .. "/var/cache/nuageinit") local tof = assert(io.open(root .. "/var/cache/nuageinit/user_data", "w")) tof:write(line .. "\n" .. content)