From nobody Sat Nov 23 12:42:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1730901640778181.1919223542734; Wed, 6 Nov 2024 06:00:40 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 820BA1410; Wed, 6 Nov 2024 09:00:39 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 101461596; Wed, 6 Nov 2024 09:00:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 43B2313B7; Wed, 6 Nov 2024 09:00:05 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id DF33F132D for ; Wed, 6 Nov 2024 08:59:54 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-mI5c6i5IPlO_F8y_UR2mFA-1; Wed, 06 Nov 2024 08:59:53 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9E07D1955D59 for ; Wed, 6 Nov 2024 13:59:52 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.164]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B3D7A19541A5 for ; Wed, 6 Nov 2024 13:59:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730901594; 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: in-reply-to:in-reply-to:references:references; bh=YkQr2zB7DOG1xQFwQFEhmLGUxiu2kgr9okLZjqiPV2Q=; b=CMq6ztAb4Y4u7XZbk8Ppm5kk9jq2Th2upKHaExe1rttIWrW4NDJzHhQ2oXXbjc3qyNiooD qPfyJWmd/iV9wKlVLsdd3EUc6jvqtKkoAKT8BKcmYhLfFz7tHq/eOIkE7JbJq7nR4S+vQU 5YjDGruIRbhdLrDsIg8uhDTQ//ljrbQ= X-MC-Unique: mI5c6i5IPlO_F8y_UR2mFA-1 X-Mimecast-MFC-AGG-ID: mI5c6i5IPlO_F8y_UR2mFA From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 3/3] ch: check return value of virJSONValueArrayAppend Date: Wed, 6 Nov 2024 14:59:27 +0100 Message-ID: <98afb5a3b494473b2a551f64c2213c7972908a04.1730901567.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HFYdW5lwr6_WcVsNgdVpRRIQZSTtpjkbKtVdSpy0gO4_1730901592 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 67IANYQ477GP3ZKOYP2D4443AJ3XAQ25 X-Message-ID-Hash: 67IANYQ477GP3ZKOYP2D4443AJ3XAQ25 X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1730901641986116600 Content-Type: text/plain; charset="utf-8" It only errors out when presented with a non-array, but we do check it everywhere else. Signed-off-by: J=C3=A1n Tomko --- src/ch/ch_monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 3e49902791..ccd04cfbd1 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -1002,7 +1002,8 @@ virCHMonitorBuildRestoreJson(virDomainDef *vmdef, return -1; if (virJSONValueObjectAppendNumberInt(net_json, "num_fds", vmd= ef->nets[i]->driver.virtio.queues)) return -1; - virJSONValueArrayAppend(nets, &net_json); + if (virJSONValueArrayAppend(nets, &net_json) < 0) + return -1; } if (virJSONValueObjectAppend(restore_json, "net_fds", &nets)) return -1; --=20 2.47.0