From nobody Sat Nov 22 17:31:59 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 4dDK003jXyz6HVYl for ; Sat, 22 Nov 2025 17:32:00 +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 4dDK000HS2z3YdN for ; Sat, 22 Nov 2025 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832720; 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=Mx2Bq3zvLlLDNfaWFVwr6CdLnyGE/tPHqJm1DJQeWNI=; b=IHieKSKkZMEvv21dw4Hy+Lma9eGc+J+kUqoN7D/0cPUvklmhfyJX3GU//UGQtSQfkMw0Sm g7LJ9nKXTuDyS6eVrOwDzSBL71pF5sjbaWPVUsAtcbpfYEQi1C0jRlBiBs/92JuarwL7NL VnTQJmHEq+ScaWd9WMEdOAhyjm3sCSwiXQH87h1fk/d8HVQjkAVDPqxyjZqOv0cj0yEfrH IJtqqOQxHuYt623EC5c5qxp+LIELyMZyIDG0HOG0VQ/UteqmX28qyxdjsZjEEd6alL9lHz iVJyzhywbbKPNbeXaVlSimzwlo4G4kaS6TPglcwzP2FSi4hLbCEWwrbbVKy7gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763832720; 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=Mx2Bq3zvLlLDNfaWFVwr6CdLnyGE/tPHqJm1DJQeWNI=; b=kLuWs6SPqGT6XpvbAXRMX+rAd4UUEBsuUqkJRwbYj/cRwp0dlK8KnC7Q3LW46JguYrr+fX WN9A8MJRkH3cs2A7CAr8PXt2KDEBKoWigLNqy5OImIsJcgeEWCCeSMA3dE23OT/cV4kT6n ArfH7A49rsOSLhViadZQbj03uzstQYTRT8gXq44FduHt1/XZCnh1Bg/VKrRlOHQ+Mm1+zU JW3C9wupyIvqhcNxBQbNN4MWJ4BcpXsEpau5T7ZzAbwgJShoPeteVHEnIsW8lKZ06zqj8X G4Yu1kV+loKnaKaFjWmQZnNGzuRTZSPG8Tk3ZLo3U6To6ljIY0J/Mfa4Z56WGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763832720; a=rsa-sha256; cv=none; b=aquuNmqvhHxy6o6r13HFFOnXg3m/CHxKXKHXIF+n8wyv0Pkyiztm02GNrME1Ac/cPXEuvq jVlW2ciB+aj8PkYzvzNCHEZ6ysXZSSY2sQNCxd85yDKG/t8R1Xn3KoUe+53wrC7V+YgrRO UJ8ptEBXXaVL1oQ6wejv/ffHpe6NWVCBcJJQWqckN7hd5//hZClGRJW28JD1TvQLhy66ht +EsnbSUbYYKTypRxCSXAiLnQbwpJA1fNetS6Wy8s0iOMcstU11aeI9X07PjD4C6X3TLDNz vFJ0/m96Jt7vvxfV9lIDJlXwa9Tj7aIz7S3Da9CGo6wDjY704syD+Gdmk/BXfw== 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 4dDJzz6g09z176b for ; Sat, 22 Nov 2025 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9fe4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 17:31:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 57d25b633352 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 57d25b6333523491ac7a3e869bd5d16127203eed Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 17:31:59 +0000 Message-Id: <6921f38f.9fe4.573c4df6@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=57d25b6333523491ac7a3e869bd5d16127203eed commit 57d25b6333523491ac7a3e869bd5d16127203eed Author: Jose Luis Duran AuthorDate: 2025-10-21 13:11:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-11-22 17:23:20 +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 --- libexec/nuageinit/nuageinit | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 0270da5c515b..a5411c60b410 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -663,8 +663,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)