From nobody Mon Feb 9 12:42:48 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=1621350354; cv=none; d=zohomail.com; s=zohoarc; b=JnMPhR3gpfNsL8f/J1EGl4xCVwgQRJCjF+QWr/XvUpbtsdGrq7Sy5EEKwcaW+CORc1KHN2GMsp0kLd7SING7wkL4M3gV7SiBmpse9FXhLNyogAC7yrOTlObOqnUZv4CsPeR183tos3EEiSncbuHdVNpSpWgOgO1cSz6HWj5oJHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621350354; 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=7Kwf8rfRNzpBSqUwgKjNythv7UHmA+qtTaIyKBqudgk=; b=GItM2JD91CLnPpbGWVNqk5ORhHyrgWsdM3l3qJqF/aDqPvTn2XHwBa4S6Y8cVjAzGNnidGxXkcLJRNJwPnCdfX10cmT6EDchLwCCnq6V9L+XeLo5UPDYvhODJE0qJYqmuTcwMh7M+lDVaN6qtNN2J+8aKaLWMePQ2eb2AYf6Wdg= 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 1621350354380883.8556818440474; Tue, 18 May 2021 08:05:54 -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-290-8sigygxWMtyFJSnLyyDS9Q-1; Tue, 18 May 2021 11:05:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82DD88049D6; Tue, 18 May 2021 15:05:44 +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 6405F687DC; Tue, 18 May 2021 15:05:44 +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 2CFCD55353; Tue, 18 May 2021 15:05:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14IF54FC019321 for ; Tue, 18 May 2021 11:05:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id CDF38E2E0; Tue, 18 May 2021 15:05:04 +0000 (UTC) Received: from work.redhat.com (ovpn-113-109.ams2.redhat.com [10.36.113.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76B79E152; Tue, 18 May 2021 15:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621350351; 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=7Kwf8rfRNzpBSqUwgKjNythv7UHmA+qtTaIyKBqudgk=; b=MywaHNPo9R60Fd/Zdkzp5aPjSgmQWWVyYzBANS1pMBOn83RHbzWIvX2DtAzWcoR1o8BB8V efXQ+bbJip/BXo7hju7L1C1/Xuyxu6wR0iPRRJPb8gkP+FhWfiQMA0ljC/fc2Z6pCcY9Qj hW2k9orWVbKmZ8YkmXdxUcrmYB+6tW4= X-MC-Unique: 8sigygxWMtyFJSnLyyDS9Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] virDomainChrSourceReconnectDefParseXML: Use virXMLProp* Date: Tue, 18 May 2021 17:04:47 +0200 Message-Id: <20210518150451.79954-7-twiederh@redhat.com> In-Reply-To: <20210518150451.79954-1-twiederh@redhat.com> References: <20210518150451.79954-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.13 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 `timeout`. Allowing negative numbers to be interpreted this way makes no sense for this attribute. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bfcc56ca9e..a5514660cc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10093,39 +10093,20 @@ virDomainChrSourceReconnectDefParseXML(virDomainC= hrSourceReconnectDef *def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cur; - g_autofree char *tmp =3D NULL; =20 ctxt->node =3D node; =20 if ((cur =3D virXPathNode("./reconnect", ctxt))) { - if ((tmp =3D virXMLPropString(cur, "enabled"))) { - if ((tmpVal =3D virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect enabled value: '%s'"), - tmp); - return -1; - } - def->enabled =3D tmpVal; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, + &def->enabled) < 0) + return -1; =20 if (def->enabled =3D=3D VIR_TRISTATE_BOOL_YES) { - if ((tmp =3D virXMLPropString(cur, "timeout"))) { - if (virStrToLong_ui(tmp, NULL, 10, &def->timeout) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect timeout value: '%s= '"), - tmp); - return -1; - } - } else { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing timeout for chardev with " - "reconnect enabled")); + if (virXMLPropUInt(cur, "timeout", 10, VIR_XML_PROP_REQUIRED, + &def->timeout) < 0) return -1; - } } } =20 --=20 2.26.3