From nobody Tue Nov 25 00:43:02 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 4dFkSR20Yjz6J61x for ; Tue, 25 Nov 2025 00:43:03 +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 4dFkSQ6rW7z42Hg for ; Tue, 25 Nov 2025 00:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764031383; 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=BchFr2j2vR+FS3BqAkT1mC505IuYvMZ9oBdhAcg2lP4=; b=WQh5rBCYVh6lxErf+FnfMeGyYIikmdg7t661YItTJGd6K9hbYBsRRMmEOE3LV8rQUuYZhM OFjmiUA7xIHCAypKZMn+3hUtpAxC29zKNLixhn5X4zrDxK+DMpDqAK4HylpC+zXwV61/pE 7x8Ugxj9xJjg70Hbd2EMy+iazjjKjfr3PN7bSSD3ElIhO8vDhrKg+5Ihz+whNBRmomR7Mm 3riR0XL+8w4UsrW2t5JpHY9sb0LXAl1HoofBkfwKnQkcOVWLK2zBDA+jo6dSC6pNmMoSGD KBr/TUPhIBrEN38rQPTC1RN+UG/N6BbQagoadSj/kOXrtv6t1fP0ILpcJGHhqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764031383; 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=BchFr2j2vR+FS3BqAkT1mC505IuYvMZ9oBdhAcg2lP4=; b=hGRUlU2Je0JTEyHGLMJSSeTvJQMUCm0l5Gbzd/LDhOf7DGohwx74rydtcUOnSz9p/rK6kE jLlYxRDOhZyxZx9XEddGEwEtoXAPUXRj61rY1Lu6OxbvIuHFPrHzJzzZGpaUqpnSO8CSBR LjkysO7AIYSn0YSAAWx2oofmk2BrcQl9QwqOOd/Ky/84ERSn2uVZo0xqZBOVDioRCtAo07 49LfkomSa7/D1aFj1mUb3Ka4clD45wJWqdJcI+KR6EwzcjH++bAN7sgCOELO1+rGZ7MEnf aiCxZPhB4CTicVmmXjd0mJaKfITIRokmEn1d3Na5BmUhyG0AteR7oQshzkrOkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764031383; a=rsa-sha256; cv=none; b=e+xAQ8yym7GK1OiUzOCxTkC8b5p6jgB56NzVWkFHYkxr+SapoLBhtwqEKlUTgLZQPvqfvG dz+OhAaw7xlYrRfn3kB6k/opant5cRaa/wQveYNb9IJRdGSzE/qcIVSw3lJ6zPC+39v1qi NfW9xIu3Lsw5MYQ0H3qx71EL54ivWD2j0k2Hl9R8Mih3luqPj9CXD9yCqNfLSVrLxWo+Nz Vnb/ZjxQedu0jAeqD+l9B01ZbYnPuWw8bvMDA8EjLgVS9Z2zKrOj0fuapqhArhs325kUmu DOxI/xIj6joDUK+SFmrIOmjHyWl/2RKllfHaSVA5TvR1FeU66OTXjCRFi+Iytw== 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 4dFkSQ5YhKzf5w for ; Tue, 25 Nov 2025 00:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24715 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 00:43:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: a7cadff8cccc - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a7cadff8ccccfa3f3cde9a501a0fe9a78299d41a Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 00:43:02 +0000 Message-Id: <6924fb96.24715.16eeea8f@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=a7cadff8ccccfa3f3cde9a501a0fe9a78299d41a commit a7cadff8ccccfa3f3cde9a501a0fe9a78299d41a Author: Jose Luis Duran AuthorDate: 2025-10-21 13:11:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-25 00:39:37 +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)