From nobody Thu Apr 06 17:47:51 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 4Pspqr2tWvz44dN9; Thu, 6 Apr 2023 17:47:52 +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 4Pspqr1ZQ0z4XHF; Thu, 6 Apr 2023 17:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680803272; 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=9bFbNkzphxmdvWXeQLo4s8N9PgvcXKT2eokSz3zo+jQ=; b=KeDO7sPYHfWiw5Mxl7ZwLICQv7ZSiujlOHbnLe2p+e5JzYg+JJlK9Tf2OD9Nx9WvPrxLtw HoaLVaTju9CopHd7ldPIvG/+9waEkg70Vc+QjRYBEBQ3uekkH/6yWBnnUkTqtqpiX8rnW/ OaymgAcCJppr6j1ugqwENd1c2MhmncbWRhuDXBnhUd0lnAnnf4Nn+4E+5EL+wsieK1Unhr z57sWKuijrb+IM+Tyo9AU6bmrO5JSLjUwzwSZQWpv2deEl4PljqaKNj+Ljy1c+MzAdF44P 4bkGsD9A3FRrp+WJszQ4EA47iZ6HwEe97ZGuHFpLj13ul8Fq1VldrbTFpuMVJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680803272; 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=9bFbNkzphxmdvWXeQLo4s8N9PgvcXKT2eokSz3zo+jQ=; b=Ef/BvMSNb2pwxbQ2BHcRdXj4iUwYNAwi9j7xEv3WFqyx3mwsqUGNnUGX/SDQ6/nCJA9oqm Btw/yOpaJZVG/WLuIOupzDBtj4qJQlSF3R/Njy4z2ARM+3MEW22cEaVagnduw0Wy5+0WwH rEDeCN6jRN2g5lj6SoMqVYBbaXPeu+/zR7Zfzqk2qV5A+FCJu0xWB187sqhGBYpgQdyuqN bs8nxAYzlAbisCy7Zn5+XSUs7CU0o5yj5VvtcJ49R9JYWS9hoHlhMJuHQYtRwQ+TVZsgin q9kbwG6YJmnGmj0XA/XvnsZc57vBhoE4en/LxoeJ9najSRXYm/698FeEDS2CfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680803272; a=rsa-sha256; cv=none; b=kSixzj0vS8gHjGBdPba9jbfwbkr//OJ59Jd+iYpDSIi5g/QAPDj7r+skbDy4dk876oClyp xZ4Lm/0+fD1Fw2O8Rf4AbuIaeXFnSdiuF0SC96PoAYi0V5hJ/MZ6fTR/F5CjhipUi1pyDa 67fekhOLd0V/+80SqbIhAhT8lWagl2AxHLt6W3hzkoK1ha7fBh/NigyjbIOicxVT7j4U/Y EOSCP592RF9GAwgw+9xVkP970MgDPX0CqmrUFiWXKsW8h5JMEpIHxtpTG8W505+iZhJ0Ez jYsZ3ry0wHgy7XzrOnW8s6c4Kt+NihSkItekvJTTB2HcPgVbwfmF1FQ+NrmWJg== 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 4Pspqq6m7nz1CMv; Thu, 6 Apr 2023 17:47:51 +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 336HlpUh077837; Thu, 6 Apr 2023 17:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336Hlpvs077836; Thu, 6 Apr 2023 17:47:51 GMT (envelope-from git) Date: Thu, 6 Apr 2023 17:47:51 GMT Message-Id: <202304061747.336Hlpvs077836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7bc4ccf3aea9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7bc4ccf3aea935dde8ffc3e7c287884e22f87646 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc4ccf3aea935dde8ffc3e7c287884e22f87646 commit 7bc4ccf3aea935dde8ffc3e7c287884e22f87646 Author: Ed Maste AuthorDate: 2023-04-06 16:53:00 +0000 Commit: Ed Maste CommitDate: 2023-04-06 17:47:35 +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 --- 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 */