From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 690B21FF14F for ; Wed, 17 Jun 2026 12:50:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E350F1E8B9; Wed, 17 Jun 2026 12:50:17 +0200 (CEST) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v1 proxmox 2/2] fix #7690: proxmox-sys: close fd before rename/unlink in replace_file Date: Wed, 17 Jun 2026 12:49:54 +0200 Message-ID: <20260617105000.232928-3-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260617105000.232928-1-r.obkircher@proxmox.com> References: <20260617105000.232928-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781693357894 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: C2YCDBN5KH5YXJIOVIVJQYHM677QIDRL X-Message-ID-Hash: C2YCDBN5KH5YXJIOVIVJQYHM677QIDRL X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Fix the rename operation on WORM file systems and allow FUSE file systems to unlink without creating temporary .fuse_hidden files. Closing the fd earlier shouldn't have any noticeable effects on normal file systems, because the path-based rename and unlink operations are completely separate from the content. Link: https://bugzilla.proxmox.com/show_bug.cgi?id=7690 Signed-off-by: Robert Obkircher --- proxmox-sys/src/fs/file.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proxmox-sys/src/fs/file.rs b/proxmox-sys/src/fs/file.rs index 533e0896..03223e5a 100644 --- a/proxmox-sys/src/fs/file.rs +++ b/proxmox-sys/src/fs/file.rs @@ -180,6 +180,7 @@ pub fn replace_file>( let (mut file, tmp_path) = make_tmp_file(&path, options)?; if let Err(err) = file.write_all(data) { + drop(file); let _ = unistd::unlink(&tmp_path); bail!("write failed: {}", err); } @@ -187,11 +188,16 @@ pub fn replace_file>( if fsync { // make sure data is on disk if let Err(err) = nix::unistd::fsync(file.as_raw_fd()) { + drop(file); let _ = unistd::unlink(&tmp_path); bail!("fsync failed: {}", err); } } + // Allow WORM file systems to commit the contents before the rename + // and prevent temporary .fuse_hidden* files created by unlink. + drop(file); + if let Err(err) = std::fs::rename(&tmp_path, &path) { let _ = unistd::unlink(&tmp_path); bail!( -- 2.47.3