From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 33AEC1FF16F for ; Tue, 14 Oct 2025 16:39:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4913F763A; Tue, 14 Oct 2025 16:39:55 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 14 Oct 2025 16:39:13 +0200 Message-ID: <20251014143946.160679-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014143946.160679-1-f.ebner@proxmox.com> References: <20251014143946.160679-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760452752799 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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 Subject: [pve-devel] [PATCH swtpm 02/16] swtpm setup: file: always just clear header rather than unlinking X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" When using a FUSE export as the target file, it cannot be unlinked. For block devices, the header is cleared, do the same for files. Signed-off-by: Fiona Ebner --- src/swtpm_setup/swtpm_backend_file.c | 42 +++++++++++----------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/src/swtpm_setup/swtpm_backend_file.c b/src/swtpm_setup/swtpm_backend_file.c index a0d0f4d..d4ca2c5 100644 --- a/src/swtpm_setup/swtpm_backend_file.c +++ b/src/swtpm_setup/swtpm_backend_file.c @@ -57,36 +57,28 @@ static int check_access(void *state, return ret == 0 || errno == ENOENT ? 0 : 1; } -/* Delete state from file: if regular file, unlink, if blockdev, zero header so - * swtpm binary will treat it as a new instance. */ +/* Delete state from file: zero header so swtpm binary will treat it as a new + * instance. */ static int delete_state(void *state) { const struct file_state *fstate = (struct file_state*)state; int fd; - if (fstate->is_blockdev) { - char zerobuf[8] = {0}; /* swtpm header has 8 byte */ - fd = open(fstate->path, O_WRONLY); - if (fd < 0) { - logerr(gl_LOGFILE, "Couldn't open file for clearing %s: %s\n", - fstate->path, strerror(errno)); - return 1; - } - /* writing less bytes than requested is bad, but won't set errno */ - errno = 0; - if (write(fd, zerobuf, sizeof(zerobuf)) < (long)sizeof(zerobuf)) { - logerr(gl_LOGFILE, "Couldn't write file for clearing %s: %s\n", - fstate->path, strerror(errno)); - close(fd); - return 1; - } - close(fd); - } else { - if (unlink(fstate->path)) { - logerr(gl_LOGFILE, "Couldn't unlink file for clearing %s: %s\n", - fstate->path, strerror(errno)); - return 1; - } + char zerobuf[8] = {0}; /* swtpm header has 8 byte */ + fd = open(fstate->path, O_WRONLY); + if (fd < 0) { + logerr(gl_LOGFILE, "Couldn't open file for clearing %s: %s\n", + fstate->path, strerror(errno)); + return 1; } + /* writing less bytes than requested is bad, but won't set errno */ + errno = 0; + if (write(fd, zerobuf, sizeof(zerobuf)) < (long)sizeof(zerobuf)) { + logerr(gl_LOGFILE, "Couldn't write file for clearing %s: %s\n", + fstate->path, strerror(errno)); + close(fd); + return 1; + } + close(fd); return 0; } -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel