From nobody Thu Mar 23 11:32:47 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 4Pj39X00PJz41DYm; Thu, 23 Mar 2023 11:32:48 +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 4Pj39W55Mxz4D9s; Thu, 23 Mar 2023 11:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679571167; 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=5HWlRPQDLhklwnh4yv8vAt39x4A6BCvTYPf4spkGTaU=; b=Nk+kRIm9ef8EBpxHpJzOIuTWl5cn72T7Gp2DP73ASSjhzKOPQuZgyY0fPSDFbpAMF4eqhY DKxupCzlHHFomH3Oqfl54aVG4dyT2pdNbexmBA4RN4Ymd0FDd1104RSmNARXlPGj3YEdaf vA3sVFjWRFQBZnQQNmiAtR97J1uaHrqIaUpJy25frVkQCG/izSlEPxYdqmRanXrYzFo2GH fxOJ/UwX/sqAL5p2ifEkdWylUWhOObtSpYopJk9R8Y+1f/DZVuiSxV/Be2h+1ar+jkmUko vX0I4zhF9opvd3L2IrzHpt/feP+nCX9xFVSNYFaPrPANU5nXYF7AZOaACtnvQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679571167; 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=5HWlRPQDLhklwnh4yv8vAt39x4A6BCvTYPf4spkGTaU=; b=rr6aIUKxFvQ+L01+xrgvhNC2Y/LFrv4UG37L/ift/sd174kMSa1nCKHlobQh1SzEkR/4cL 4AxuKX9P43KU2L3w0F+02m1eEy+0pdbh0Wx2jdcdSOMX3ezc+2yBkrfGBVQRrc2k9ZT1bM FImKJ0pUwMVbSYNT0wRTLah6n1Q/9Dac92tXCG3Mf2amtz2P8jEXaTSg7Kp3A9u60Dheol Q92E8Pgy7qTP8qOIyfIFycv8YMakAO3Y3L/WutZDoMeDVArHhJN4RDQMk9q0mJTQGcvm7n epDaH1dIeCMi/zs3a57mvWK8nt8px6ayqUx/QUPuIGJ0ThNYYgWf2+MrTGLU7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679571167; a=rsa-sha256; cv=none; b=qFKj/0rEBfGWlxM0/k0H3s7ErxEZhprejymn1jI9U6sjtromGvG0oq53BV92Sxyu89Rt0N g3/rCVvKp4+ROLf2PESi3wjJbUVmkO+xPXjhl60r4g/idCkAh5fEyyjOk+4aMvUB0Uhkni rjhFVSlqzpgy0bJ6hLDO6u9GHuVNRItfkw+o9xW91brwZs0p/tYuAr9DgJtWKoE7wsua1e Hau0t9Ey1M98CQS1rpwYJ1Kox1inQDMfGHdUgpvF5GRMRIu1MpRwHssfjmjhBXXSdBf3Q5 iJ8+HnyeY87x2HY1Rh7jLdTQOibsBgesWV3IZuEvPRajn64AT989U3qx/cKyyg== 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 4Pj39W49k1zZ72; Thu, 23 Mar 2023 11:32:47 +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 32NBWlRg098140; Thu, 23 Mar 2023 11:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NBWlnO098139; Thu, 23 Mar 2023 11:32:47 GMT (envelope-from git) Date: Thu, 23 Mar 2023 11:32:47 GMT Message-Id: <202303231132.32NBWlnO098139@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: c65c969bd5d4 - main - makefs: correct iso9660 Rock Ridge TF timestamps 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: c65c969bd5d4ae7c52dedafb3c39b7e933079d4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c65c969bd5d4ae7c52dedafb3c39b7e933079d4a commit c65c969bd5d4ae7c52dedafb3c39b7e933079d4a Author: Ed Maste AuthorDate: 2023-03-22 23:42:45 +0000 Commit: Ed Maste CommitDate: 2023-03-23 11:11:58 +0000 makefs: correct iso9660 Rock Ridge TF timestamps The bit definitions for the TF_* timestamp bits (TF_MODIFY, etc.) were incorrect, and timestamps were written in the wrong order. See RRIP 4.1.6 Description of the "TF" System Use Entry for details. PR: 203531 Reported by: Thomas Schmitt Reviewed by: jrtc27, kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39221 --- usr.sbin/makefs/cd9660/iso9660_rrip.c | 4 ++-- usr.sbin/makefs/cd9660/iso9660_rrip.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index d4440a656bad..afe46c58747d 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -699,11 +699,11 @@ cd9660node_rrip_tf(struct ISO_SUSP_ATTRIBUTES *p, fsnode *_node) */ cd9660_time_915(p->attr.rr_entry.TF.timestamp, - _node->inode->st.st_atime); + _node->inode->st.st_mtime); p->attr.rr_entry.TF.h.length[0] += 7; cd9660_time_915(p->attr.rr_entry.TF.timestamp + 7, - _node->inode->st.st_mtime); + _node->inode->st.st_atime); p->attr.rr_entry.TF.h.length[0] += 7; cd9660_time_915(p->attr.rr_entry.TF.timestamp + 14, diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.h b/usr.sbin/makefs/cd9660/iso9660_rrip.h index 3e1a6cb0e7d8..ef35405c62e6 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.h +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.h @@ -52,14 +52,14 @@ #define PX_LENGTH 0x2C #define PN_LENGTH 0x14 -#define TF_CREATION 0x00 -#define TF_MODIFY 0x01 -#define TF_ACCESS 0x02 -#define TF_ATTRIBUTES 0x04 -#define TF_BACKUP 0x08 -#define TF_EXPIRATION 0x10 -#define TF_EFFECTIVE 0x20 -#define TF_LONGFORM 0x40 +#define TF_CREATION 0x01 +#define TF_MODIFY 0x02 +#define TF_ACCESS 0x04 +#define TF_ATTRIBUTES 0x08 +#define TF_BACKUP 0x10 +#define TF_EXPIRATION 0x20 +#define TF_EFFECTIVE 0x40 +#define TF_LONG_FORM 0x80 #define NM_CONTINUE 0x80 #define NM_CURRENT 0x100 #define NM_PARENT 0x200