From nobody Tue Feb 10 00:58:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619522001; cv=none; d=zohomail.com; s=zohoarc; b=fjpSr3D4J/oei7J9K8aWLtRCWg800cU80Iu0HiHMjJ7cxBIOaUeJyo0EaagDmzXBswlT7391UvfiDcWQdWizSMXJSBFvkgHkmeI2J7EgAZCLis3hZRkLim0xug/+4CUYfa0i5eA4YSH5EO1S2i9gvkW06aCMPJpQW9G3qDEyYDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619522001; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JvxMHzEzQ5cinI80RT7rF10up5frTrLf/azGh6/5b58=; b=YH1HY2gQSvy2zVWUQue7JpjfuNKIO8c4yW1wshaAxtJwjSW7K9sHAL6wvss8jYawkMjY2A3+AY4mr5WXX6IIS/ZALsmdqsP8C7ngFrX/vFfAcmfu5U8D1PSGB1GP1nY4Ii8z6Ibq1NqLWRInNDoYQp/rfcPAvTitSQnVhxWy7c0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619522001438620.5932955447296; Tue, 27 Apr 2021 04:13:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-598-jBa1cFpsPIWMQFXotRT8mw-1; Tue, 27 Apr 2021 07:13:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FE156D4E3; Tue, 27 Apr 2021 11:13:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF5975E1A4; Tue, 27 Apr 2021 11:13:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A287244A5A; Tue, 27 Apr 2021 11:13:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13RBD7ni009679 for ; Tue, 27 Apr 2021 07:13:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id C002814106; Tue, 27 Apr 2021 11:13:07 +0000 (UTC) Received: from work.redhat.com (ovpn-113-91.ams2.redhat.com [10.36.113.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91DEC687FC; Tue, 27 Apr 2021 11:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619522000; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JvxMHzEzQ5cinI80RT7rF10up5frTrLf/azGh6/5b58=; b=Rl7npBiDRQoBK6YUtQAe0IQ3zpVlSF/YddgU6/wCKcB2EDY0gl4sVdjFK6i9Ub8orAT99b e8saVYPEH+dGUdAwpR3PbXEqU0BMer4BhweG0e2jcbDqso1dvQVz9fMfDBQV0c6eklfiCS FVLnFBxkyld6OX9jFm9oAltXSwLAWh0= X-MC-Unique: jBa1cFpsPIWMQFXotRT8mw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/6] virDomainFeaturesDefParse: Use virXMLPropUInt Date: Tue, 27 Apr 2021 13:12:54 +0200 Message-Id: <20210427111257.157406-4-twiederh@redhat.com> In-Reply-To: <20210427111257.157406-1-twiederh@redhat.com> References: <20210427111257.157406-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This strictens the parser to disallow negative values (interpreted as `UINT_MAX + value + 1`) for attribute `retries`. UINT_MAX holds no special significance for this attribute and is distinctly out of range for normal use. Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 59630415a4..b1e5115c7e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18108,12 +18108,10 @@ virDomainFeaturesDefParse(virDomainDef *def, if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - if (virXPathUInt("string(./@retries)", ctxt, - &def->hyperv_spinlocks) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid HyperV spinlock retry count"= )); + if (virXMLPropUInt(nodes[i], "retries", 0, + VIR_XML_PROP_REQUIRED, + &def->hyperv_spinlocks) < 0) return -1; - } =20 if (def->hyperv_spinlocks < 0xFFF) { virReportError(VIR_ERR_XML_ERROR, "%s", --=20 2.26.3