From nobody Sat Feb 7 15:28:29 2026 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 17256259589881.8772829520074765; Fri, 6 Sep 2024 05:32:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DAA971858; Fri, 6 Sep 2024 08:32:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9481017B3; Fri, 6 Sep 2024 08:32:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1ED2B13EF; Fri, 6 Sep 2024 08:32:01 -0400 (EDT) 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 AA4D91543 for ; Fri, 6 Sep 2024 08:32:00 -0400 (EDT) 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-75-ryJ4gTv3PECLnrDi3J6O9Q-1; Fri, 06 Sep 2024 08:31:59 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 64C801956069 for ; Fri, 6 Sep 2024 12:31:58 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.24]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 718853000236 for ; Fri, 6 Sep 2024 12:31:57 +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=3.0 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_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725625920; 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=wZ+J7bIgyOFUolFvbHrF5eIoBIgjb6mMj26/p1fT5zo=; b=X/itBJOpDGIjwn4EpSFnCMWNQLX9y6lmzgg6r5bCdA0B8E1isJH79MYAevSfMyMPumVwPT LnoACRhef/CNKYjpVUl2NDTh2NFdoME6bxR3Xl+a8kJfCsdZiYFgPqJcG1SNL8XnI2P6fu dacSAFoSYz6vpI9dNmmQ94QGGKlE4IA= X-MC-Unique: ryJ4gTv3PECLnrDi3J6O9Q-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/2] conf: Don't overwrite KVM feature config struct if the feature is present twicea Date: Fri, 6 Sep 2024 14:31:53 +0200 Message-ID: <048b38a13768b30842dd3225d65dd2cda9a179e7.1725625894.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WN6OW3M5Y7H4KEWN7KTRAHNHATXZ4KHL X-Message-ID-Hash: WN6OW3M5Y7H4KEWN7KTRAHNHATXZ4KHL X-MailFrom: pkrempa@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: 1725625960487116600 Content-Type: text/plain; charset="utf-8" Don't allocate the struct if it exists already. This sidesteps the discussion about whether forbidding multiple feature definitions makes sense. Fixes: a8e0f9c682143c63897de5c379d3ac3791c51970 Closes: https://gitlab.com/libvirt/libvirt/-/issues/670 Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5f0b35be5e..a263612ef7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16657,10 +16657,12 @@ static int virDomainFeaturesKVMDefParse(virDomainDef *def, xmlNodePtr node) { - g_autofree virDomainFeatureKVM *kvm =3D g_new0(virDomainFeatureKVM, 1); g_autoptr(GPtrArray) feats =3D virXMLNodeGetSubelementList(node, NULL); size_t i; + if (!def->kvm_features) + def->kvm_features =3D g_new0(virDomainFeatureKVM, 1); + for (i =3D 0; i < feats->len; i++) { xmlNodePtr feat =3D g_ptr_array_index(feats, i); int feature; @@ -16678,20 +16680,20 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, &value) < 0) return -1; - kvm->features[feature] =3D value; + def->kvm_features->features[feature] =3D value; /* dirty ring feature should parse size property */ if (feature =3D=3D VIR_DOMAIN_KVM_DIRTY_RING && value =3D=3D VIR_TRISTATE_SWITCH_ON) { if (virXMLPropUInt(feat, "size", 0, VIR_XML_PROP_REQUIRED, - &kvm->dirty_ring_size) < 0) { + &def->kvm_features->dirty_ring_size) < 0) { return -1; } - if (!VIR_IS_POW2(kvm->dirty_ring_size) || - kvm->dirty_ring_size < 1024 || - kvm->dirty_ring_size > 65536) { + if (!VIR_IS_POW2(def->kvm_features->dirty_ring_size) || + def->kvm_features->dirty_ring_size < 1024 || + def->kvm_features->dirty_ring_size > 65536) { virReportError(VIR_ERR_XML_ERROR, "%s", _("dirty ring must be power of 2 and ranges= [1024, 65536]")); @@ -16701,7 +16703,6 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, } def->features[VIR_DOMAIN_FEATURE_KVM] =3D VIR_TRISTATE_SWITCH_ON; - def->kvm_features =3D g_steal_pointer(&kvm); return 0; } --=20 2.46.0 From nobody Sat Feb 7 15:28:29 2026 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 1725625978965585.4761840978573; Fri, 6 Sep 2024 05:32:58 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E73771700; Fri, 6 Sep 2024 08:32:57 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0CCD218B7; Fri, 6 Sep 2024 08:32:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8A6C613EF; Fri, 6 Sep 2024 08:32:02 -0400 (EDT) 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 18F6D1543 for ; Fri, 6 Sep 2024 08:32:02 -0400 (EDT) Received: from mx-prod-mc-02.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-384-ol2DmUKkOUe3qU3pGcIIvw-1; Fri, 06 Sep 2024 08:32:00 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E38BD195394C for ; Fri, 6 Sep 2024 12:31:59 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.24]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B6E483000236 for ; Fri, 6 Sep 2024 12:31:58 +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=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725625921; 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=t/XXFSSiGmSLAtCm3qPm/1W4WkPY0yaOVQJiNTXn900=; b=QZ/mdQvHsZTCAX834O9sqkXRQ1LzhcIbnEhsSudYD8Y3uKUkqr5OZvAi2pOpaYhak0BZK3 e7augPZZAdL5zARGReA4UaGzMflDonw33YYm68VihO9hIfSWhHi2j0lE4dTQLefyPA7kRG ZYVlF5TsUAeY7KOfhmHmLbz/qiC1LXs= X-MC-Unique: ol2DmUKkOUe3qU3pGcIIvw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/2] virconf: Fix numeric overflow when parsing numbers in conf files Date: Fri, 6 Sep 2024 14:31:54 +0200 Message-ID: <4a5f508ac00ba50f9592a06896709861d1f848ca.1725625894.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UEWHPRSI6RQQXRDQB4E2SBKTJN6WSJXU X-Message-ID-Hash: UEWHPRSI6RQQXRDQB4E2SBKTJN6WSJXU X-MailFrom: pkrempa@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: 1725625980427116600 Content-Type: text/plain; charset="utf-8" The number is parsed manually without making sure it'll fit. Fixes: 3bbac7cdb67 Closes: https://gitlab.com/libvirt/libvirt/-/issues/671 Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/util/virconf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virconf.c b/src/util/virconf.c index 8fdf40e9d0..da07af178d 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -347,6 +347,12 @@ virConfParseLong(virConfParserCtxt *ctxt, long long *v= al) return -1; } while ((ctxt->cur < ctxt->end) && (g_ascii_isdigit(CUR))) { + if (l > LLONG_MAX / 10) { + virConfError(ctxt, VIR_ERR_OVERFLOW, + _("numeric overflow in conf value")); + return -1; + } + l =3D l * 10 + (CUR - '0'); NEXT; } --=20 2.46.0