From nobody Sat Nov 23 09:38:22 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 1730901626198182.0600975436381; Wed, 6 Nov 2024 06:00:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0DAB412E6; Wed, 6 Nov 2024 09:00:25 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 606BB13BB; Wed, 6 Nov 2024 08:59:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A029E12E6; Wed, 6 Nov 2024 08:59:52 -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 23C4E12E5 for ; Wed, 6 Nov 2024 08:59:52 -0500 (EST) Received: from mx-prod-mc-01.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-571-WLWz79FiPOOSBQ566sTAvg-1; Wed, 06 Nov 2024 08:59:50 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BE242195421E for ; Wed, 6 Nov 2024 13:59:49 +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 C6C4119541A5 for ; Wed, 6 Nov 2024 13:59:48 +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=1730901591; 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=Eom09MazBlyCaeH6ZA8osxNctViTXEVbmvVfJGzGSWM=; b=GTFCKhGBPpJzI0qVIcjXzs+8tl/AqTvxhBJBYucDke5vSM2uqSTVZwFyWOTmqugvijmwgo 2lmel8A3C0BfaCMXYRwOm543t0RMdhJCXE/3GUpm9L/EYMoAgppn2XBhBTgGcxxc1tCa5W cQ3Mp0Gm7ccuAUlUuKdeVv2yuvF9Qx4= X-MC-Unique: WLWz79FiPOOSBQ566sTAvg-1 X-Mimecast-MFC-AGG-ID: WLWz79FiPOOSBQ566sTAvg From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/3] qemu: chardev: avoid impossible overflow Date: Wed, 6 Nov 2024 14:59:25 +0100 Message-ID: <3a4769a3eee888d72c0d3d0d90ebd0f3e0ba394a.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: F9BZcXwiZPVkIRR8pz6g5fQeTBOOTmTGYYEupl1K26U_1730901589 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ONT4VQYOHVQRF2RWIZMQWSVBW7DJKCBV X-Message-ID-Hash: ONT4VQYOHVQRF2RWIZMQWSVBW7DJKCBV 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: 1730901627953116600 Content-Type: text/plain; charset="utf-8" In the rare case where int and long long are not the same size, the multiplication of an int variable and an int constant might overflow. Cast the constant to long long to avoid this. Signed-off-by: J=C3=A1n Tomko Fixes: baa4edfb79d5ee861a08b5ec11416c5c156d8cd2 Reviewed-by: Peter Krempa --- src/qemu/qemu_chardev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_chardev.c b/src/qemu/qemu_chardev.c index b6828b6752..6b29744975 100644 --- a/src/qemu/qemu_chardev.c +++ b/src/qemu/qemu_chardev.c @@ -247,7 +247,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, =20 if (reconnect !=3D -1 && virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_RECONNECT_MILISECON= DS)) { - reconnect_ms =3D reconnect * 1000; + reconnect_ms =3D reconnect * (long long) 1000; reconnect =3D -1; } =20 --=20 2.47.0 From nobody Sat Nov 23 09:38:22 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 1730901655055438.1038092802345; Wed, 6 Nov 2024 06:00:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DB46E9A7; Wed, 6 Nov 2024 09:00:53 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9A3BB157C; Wed, 6 Nov 2024 09:00:10 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A68A815E0; 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.133.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 8B6891596 for ; Wed, 6 Nov 2024 08:59:55 -0500 (EST) Received: from mx-prod-mc-05.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-298-BPM96YFGOQS1uXIEYoF_zg-1; Wed, 06 Nov 2024 08:59:52 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 34B1D1955F28 for ; Wed, 6 Nov 2024 13:59:51 +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 5AAC219541A5 for ; Wed, 6 Nov 2024 13:59:50 +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_H3,RCVD_IN_MSPIKE_WL,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=1730901595; 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=kdH3pZBAeroeqafN3vF3RwoqfMcMBUGBAKhNgoHnmtg=; b=NnTXMxvHfL+IplaVxYNB1L3l4roilUAJ98J7TA+O3Y3clxZ60PMHTNp0ks4iJdFUaSRrsr q1HtrV0k+lkc337iHXNpptRF4m/2uPzxyD/abXfPRGFHyCJlnBrXj3u3si6s3Rho5RdoTs nvdwgOkxj0EemP7g2kxWYubtihLZZIs= X-MC-Unique: BPM96YFGOQS1uXIEYoF_zg-1 X-Mimecast-MFC-AGG-ID: BPM96YFGOQS1uXIEYoF_zg From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: devel@lists.libvirt.org Subject: [libvirt PATCH 2/3] util: json: check return value of virJSONValueFromJsonC Date: Wed, 6 Nov 2024 14:59:26 +0100 Message-ID: <39792eb94db9c9da028420a411d67c0f03e61c85.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: kHQNbtpUbw20f_VubtfMrOXd0Vn71tjclCpyE0vJl-c_1730901591 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EO2XYQNGYREKW7SX3ZYTCPP67PH435YH X-Message-ID-Hash: EO2XYQNGYREKW7SX3ZYTCPP67PH435YH 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: 1730901656222116600 Content-Type: text/plain; charset="utf-8" In virJSONValueFromJsonC, the return value of virJSONValueFromJsonC was not checked in one case. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/util/virjson.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/virjson.c b/src/util/virjson.c index 18a4585e7b..a799707c16 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1437,6 +1437,11 @@ virJSONValueFromJsonC(json_object *jobj) =20 cur =3D virJSONValueFromJsonC(val); =20 + if (!cur) { + g_free(ret); + return NULL; + } + virJSONValueArrayAppend(ret, &cur); } break; --=20 2.47.0 From nobody Sat Nov 23 09:38:22 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 Reviewed-by: Peter Krempa --- 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