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 13A3A1FF38A for ; Fri, 14 Jun 2024 12:50:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6AB7FB29B; Fri, 14 Jun 2024 12:50:42 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 14 Jun 2024 12:50:06 +0200 Message-Id: <20240614105006.51994-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.058 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [meson.build] Subject: [pve-devel] [PATCH qemu] fix #4726: avoid superfluous check in vma code 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" The 'status' pointer is dereferenced after the NULL check. Since all callers pass in the address of a struct on the stack, the pointer can never be NULL. Remove the superfluous check and add an assert instead. Signed-off-by: Fiona Ebner --- ...VE-Backup-add-vma-backup-format-code.patch | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch index ee40ab8..d6d7767 100644 --- a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch +++ b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch @@ -16,10 +16,10 @@ Signed-off-by: Fiona Ebner block/meson.build | 2 + meson.build | 5 + vma-reader.c | 870 ++++++++++++++++++++++++++++++++++++++++++++ - vma-writer.c | 818 +++++++++++++++++++++++++++++++++++++++++ + vma-writer.c | 817 +++++++++++++++++++++++++++++++++++++++++ vma.c | 901 ++++++++++++++++++++++++++++++++++++++++++++++ vma.h | 150 ++++++++ - 6 files changed, 2746 insertions(+) + 6 files changed, 2745 insertions(+) create mode 100644 vma-reader.c create mode 100644 vma-writer.c create mode 100644 vma.c @@ -939,10 +939,10 @@ index 0000000000..d0b6721812 + diff --git a/vma-writer.c b/vma-writer.c new file mode 100644 -index 0000000000..126b296647 +index 0000000000..a466652a5d --- /dev/null +++ b/vma-writer.c -@@ -0,0 +1,818 @@ +@@ -0,0 +1,817 @@ +/* + * VMA: Virtual Machine Archive + * @@ -1517,17 +1517,16 @@ index 0000000000..126b296647 + int i; + + g_assert(vmaw != NULL); ++ g_assert(status != NULL); + -+ if (status) { -+ status->status = vmaw->status; -+ g_strlcpy(status->errmsg, vmaw->errmsg, sizeof(status->errmsg)); -+ for (i = 0; i <= 255; i++) { -+ status->stream_info[i] = vmaw->stream_info[i]; -+ } -+ -+ uuid_unparse_lower(vmaw->uuid, status->uuid_str); ++ status->status = vmaw->status; ++ g_strlcpy(status->errmsg, vmaw->errmsg, sizeof(status->errmsg)); ++ for (i = 0; i <= 255; i++) { ++ status->stream_info[i] = vmaw->stream_info[i]; + } + ++ uuid_unparse_lower(vmaw->uuid, status->uuid_str); ++ + status->closed = vmaw->closed; + + return vmaw->status; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel