From nobody Mon Apr 10 13:38:08 2023 X-Original-To: dev-commits-src-branches@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 4Pw95s0knHz44GgP; Mon, 10 Apr 2023 13:38:09 +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 4Pw95r6QZNz4PCh; Mon, 10 Apr 2023 13:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681133888; 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=0euinbZ5oSrbKFb2rd9hM3GjCacV5Jqy4gEFEi2pvtM=; b=FQ4/H5JYk80DG7ui7ju4jMUlQsvACGE2jgQ3Rl0MjNGGn/kZkNTLHMNhe4WDARS4ekgseX 8FoucPnfaNsH1dvffSS11SjsO/IQTmVp7adM9VL8HttgNbJV7Qekms7hvqzAoqHOW/lJA7 z7QEzkF6aZhAOUeVD9hPyu++pX1onpGYw4LHzkTpki5yFO8p0pWRDUo2Ia4Ya0UE4nzbX8 ZRbrCwwTyppXnqM+X4K+vc2LLwa82c/2MSz33ByYTs9qnThW/WLFv2qYgpr7gGYzKU9oqV xmuzHqhgpVufQH2XmDz5zSSHZlp3MSkaRKHZMM4qEkse/TDu6L/sJHGL2iIFHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681133888; 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=0euinbZ5oSrbKFb2rd9hM3GjCacV5Jqy4gEFEi2pvtM=; b=PVujl6BztbSnQ5IdEa2kXa5WXcldaAvZ8L11bBUrEwO+QZ1W9yHN2MJLwWrkSWvi/AyFyd 8pxmiqvsQ+Nnf89Ey9f7E+D7WM8Sm5yfcB9waJvX497EjrQ3LF6MRd+kRwaSAOQJsYB/Or JbAjRLJTF6uzvzfHQs3dELSeYINubJ7JGiVuLIDPNl4Qd9bRb7m22g+xDKHKa4fsLG+Om1 HcQRT8a5argMfTlpJiskR3MWvTjkAnOgkkWkogbT9wsYc6FD3MmvfX5EUg3axVfgGa8qWc 9TEfC52ZGrRrvEPgPSceHMXCk/dD0LYJP+uDdikD5P1quF1kikr/L6otb/j4Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681133888; a=rsa-sha256; cv=none; b=rbX6qMHDCs3uON/VNlR4TiTQuDZNhxp/YS6s+E9U2g2QSjzJdSOnE8WmsxoRsEzlyuPzhi L4ERk1BUAQITozxizpGGo9oW43vPyMKgZz9j2i54K6cq2dYsW4/ndIZaSociNx8ZJGyjoU 9a8M18M3UQTvdpvvvL6kWzdIx5PHIc4OhzWyJxXVYQaMyQhikx2/ZtX7r7U/W+Nrc9ScRn bHvhGmmVJWByh8jcqHNLpRMlu1en6Sgo3Y90KiSXUzrRLCloyhGH70/HR+5UWhX8yschMv +qeVCx0HDP3KezmqA7cjVnX/h9QJnaUbusSah0sw/yFJRWMZMPI4NS93XoF/EA== 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 4Pw95r5MD0zrff; Mon, 10 Apr 2023 13:38:08 +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 33ADc8FG062798; Mon, 10 Apr 2023 13:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ADc8LQ062797; Mon, 10 Apr 2023 13:38:08 GMT (envelope-from git) Date: Mon, 10 Apr 2023 13:38:08 GMT Message-Id: <202304101338.33ADc8LQ062797@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: a79601b07a9f - stable/13 - makefs: correct iso9660 Rock Ridge TF timestamps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: a79601b07a9ffacd4a69195f4a175c228d96ac06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a79601b07a9ffacd4a69195f4a175c228d96ac06 commit a79601b07a9ffacd4a69195f4a175c228d96ac06 Author: Ed Maste AuthorDate: 2023-03-22 23:42:45 +0000 Commit: Ed Maste CommitDate: 2023-04-10 13:37:40 +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 (cherry picked from commit c65c969bd5d4ae7c52dedafb3c39b7e933079d4a) --- 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