From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 518D7C9DA for ; Mon, 10 Jul 2023 10:53:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 39E8B3C744 for ; Mon, 10 Jul 2023 10:53:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 10 Jul 2023 10:53:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D0D7E424FB for ; Mon, 10 Jul 2023 10:53:15 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 10 Jul 2023 10:53:01 +0200 Message-Id: <20230710085302.27606-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230710085302.27606-1-f.ebner@proxmox.com> References: <20230710085302.27606-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 qemu-server 3/4] qmeventd: VMID from PID: don't fail immediately when encountering unexpected entry 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: , X-List-Received-Date: Mon, 10 Jul 2023 08:53:17 -0000 While such entries shuoldn't exist in practice without manually messing around, it's not hard to imagine, and there's still a good chance the actual VMID can still be found. It's still unexpected to encounter such entries so keep the log line. Signed-off-by: Fiona Ebner --- New in v2. qmeventd/qmeventd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c index 0130103d..76a894cb 100644 --- a/qmeventd/qmeventd.c +++ b/qmeventd/qmeventd.c @@ -105,7 +105,7 @@ get_vmid_from_pid(pid_t pid) char *cgroup_path = strrchr(buf, ':'); if (!cgroup_path) { fprintf(stderr, "unexpected cgroup entry %s\n", buf); - goto ret; + continue; } cgroup_path++; @@ -116,13 +116,13 @@ get_vmid_from_pid(pid_t pid) char *vmid_start = strrchr(buf, '/'); if (!vmid_start) { fprintf(stderr, "unexpected cgroup entry %s\n", buf); - goto ret; + continue; } vmid_start++; if (vmid_start[0] == '-' || vmid_start[0] == '\0') { fprintf(stderr, "invalid vmid in cgroup entry %s\n", buf); - goto ret; + continue; } errno = 0; -- 2.39.2