From nobody Fri Apr 14 12:52:54 2023 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 4Pybvq0Pzrz45Bj8; Fri, 14 Apr 2023 12:52:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pybvp5p2vz3rvY; Fri, 14 Apr 2023 12:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476774; 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=rwf87RkxsfiR/w68gcTfovPS87CcsgM1idnJB5vFiRU=; b=LVG4G6z77SrGwUoSq2aarBJ6ERdnHnV60NShAyVK6c0RbRjlrW7JnqLkiEZWRZi10BY5jH DfsCziYafHWHbpITkmYyw+yw0IUMV05/SzsPMAL4R0pIFOBsNrKBhpgxRu71yYk54al4ND jLXBr6xW73GOesroEkrxcDRCmcTNBA4zwk+0RmqdfL2d1fWbRT6rUfcisZNPq93ZKQWcSG RJZvlxc1DwtUMhHSy0hmCxMy4S3UQKi69R+wMtE2pmci73+yeeMrdboswNQ+lEX+GNN/QR bPEDrmIla1XtWMbGkqDiy7ytiZXx0T/GUnoDAC9wHqCkvPE7GluXzLACpoqjlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476774; 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=rwf87RkxsfiR/w68gcTfovPS87CcsgM1idnJB5vFiRU=; b=RwGi3kq5ire2FLMImVPTdSd25eIelSlY6y4+p/wL2wTshKKOsmBrplPGm/Vslb6hOBiatd CQ91DYcVatQuJ0ETpPZiS4eQOREvdYbFJ0HgHG7+XaXNyFCWM7RXfifhUh7W6J7nbEeOS5 Qlmj1voNOe2AAtpAKFSDsj9telzqi2JKLRpSXWpHMZYF5rdMnr19iapVD/xbuON8P+Xtm+ UdTe1eMxsYEgVf/2rCVqil0TMdbXygMY7bqBjTQkyXWifdat6a7GNJQHDTAN2DFX1iyGod NdBDsduAWiYdEmpv6TDJgrpoLZ9y8B0TVqj9pK+wU2kOjcLXG44O7b/JJgQA9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476774; a=rsa-sha256; cv=none; b=lAnm63elg3XuTzNJfedv4MKHykUKZxSHxA7ZTdAqq3WTQbwnHkP4vZNujH4KnkG1CAgraJ C+wsCN4Xaf93YmIxhAoxjxkHb2GWM+3Bqt0jlBHy1vs1zdp+mnRaTBqpP8Yi/mgUipCKnF BKZ1GcCnz/Gkea3Xtrw48g75EyskQOc7Q0wpUygc9C7zRnCnNuUFbHVnrG6ZrrUx5KoZn7 ncdz809Sv6VBVb0uuztOdzijFTv+bSw3iP+yRsAyaX7SQHgDgnKCb4x1Movk9NX1ch0WMZ iskrrGbmGkspqnrsaanh7TjmAsZXPK/QlNl32ad49DbxyDO7p2HzoAk2W74jJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pybvp4krTzPrt; Fri, 14 Apr 2023 12:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ECqsoO074847; Fri, 14 Apr 2023 12:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECqsMs074846; Fri, 14 Apr 2023 12:52:54 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:54 GMT Message-Id: <202304141252.33ECqsMs074846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1a38a53924e5 - stable/13 - makefs: avoid uninitialized memory in root directory date 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a38a53924e5b43a14bea8e87aac42176c336ff8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1a38a53924e5b43a14bea8e87aac42176c336ff8 commit 1a38a53924e5b43a14bea8e87aac42176c336ff8 Author: Ed Maste AuthorDate: 2023-04-06 16:53:00 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:37 +0000 makefs: avoid uninitialized memory in root directory date Move date setting into cd9660_populate_iso_dir_record so there is no path that leaves it unset. PR: 203531 Reported by: Thomas Schmitt Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39258 (cherry picked from commit 7bc4ccf3aea935dde8ffc3e7c287884e22f87646) --- usr.sbin/makefs/cd9660.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 4159e08c8210..cf2696e578a4 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -727,7 +727,10 @@ cd9660_populate_iso_dir_record(struct _iso_directory_record_cd9660 *record, u_char ext_attr_length, u_char flags, u_char name_len, const char * name) { + time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL); + record->ext_attr_length[0] = ext_attr_length; + cd9660_time_915(record->date, tstamp); record->flags[0] = ISO_FLAG_CLEAR | flags; record->file_unit_size[0] = 0; record->interleave[0] = 0; @@ -814,7 +817,6 @@ cd9660_fill_extended_attribute_record(cd9660node *node) static int cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) { - time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL); u_char flag; char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING]; @@ -831,12 +833,6 @@ cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode) cd9660_populate_iso_dir_record(newnode->isoDirRecord, 0, flag, strlen(temp), temp); - /* Set the various dates */ - - /* If we want to use the current date and time */ - - cd9660_time_915(newnode->isoDirRecord->date, tstamp); - cd9660_bothendian_dword(newnode->fileDataLength, newnode->isoDirRecord->size); /* If the file is a link, we want to set the size to 0 */