From nobody Mon Feb 9 09:08:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1621350355; cv=none; d=zohomail.com; s=zohoarc; b=Ets98AMbEKvJnDIRXlfdPkqdMKtMGRJtvEcGDK05XFDhhMNhs2sKGCieG+QfNKlVMuQroI1Iehd5h7AOvr/hlb96EnbfzCYL+kSXyoJ5n91NkiCUqG8vLgXxxx4iErikx0GQ4ZS2ZgUvNBjjhd/PtjN4liAjIwlXQUUmXKqUg54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621350355; 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=9IYg1sIOuSnhz0baNLf/tZYl4mofblCcDFFwDQFrHQY=; b=VRrhjMaX0Io79LkT6eZ07+jc3ogOZqdoJF60eSgeky00pJZ8RLvXszV/UVHEXTgAkrjyLOxkgNCwsWoPYv8drZEsB9ZK0mt+9zhohlsAEF1IDugcW+oQfvbghqaPDvov3osv0ZdZf/S7e38jiEGLL+IvnVudGKt58ay7wmOTdUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621350354689507.67930574460297; 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-113-FYW-VlRcOBqmwaTUNoK1iw-1; Tue, 18 May 2021 11:05:49 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47B1B106BB2D; Tue, 18 May 2021 15:05:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 24F7518506; Tue, 18 May 2021 15:05:41 +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 DEA71180B464; Tue, 18 May 2021 15:05:40 +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 14IF59CL019354 for ; Tue, 18 May 2021 11:05:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 51E9A19D9F; Tue, 18 May 2021 15:05:09 +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 9C06A1A868; Tue, 18 May 2021 15:05:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621350352; 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=9IYg1sIOuSnhz0baNLf/tZYl4mofblCcDFFwDQFrHQY=; b=LfIJTcKXl/yuNGh2Wmqq7vcOSvSTvB4a+2KI6CBLC9iTmjlCgI1ce/k5mmcqhQhSWO8fcP i1Y+bsY3nJPG0Qa4AK5RUYYPg4dxwHTAoVVzfc9bbKFV6jcI7PrAXKnR3hRVfpc62okcj7 eKcdgywN3aMnoP1TgOgYIRfJRBYYp3I= X-MC-Unique: FYW-VlRcOBqmwaTUNoK1iw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] virDomainAudioOSSParse: Use virXMLProp* Date: Tue, 18 May 2021 17:04:50 +0200 Message-Id: <20210518150451.79954-10-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.14 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 `bufferCount`. Allowing negative numbers to be interpreted this way makes no sense for this attribute. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a46e64c64a..b3ed3a9c5a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13074,26 +13074,15 @@ static int virDomainAudioOSSParse(virDomainAudioIOOSS *def, xmlNodePtr node) { - g_autofree char *tryPoll =3D virXMLPropString(node, "tryPoll"); - g_autofree char *bufferCount =3D virXMLPropString(node, "bufferCount"); - def->dev =3D virXMLPropString(node, "dev"); =20 - if (tryPoll && - ((def->tryPoll =3D - virTristateBoolTypeFromString(tryPoll)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'tryPoll' value '%s'"), tryPoll); + if (virXMLPropTristateBool(node, "tryPoll", VIR_XML_PROP_NONE, + &def->tryPoll) < 0) return -1; - } =20 - if (bufferCount && - virStrToLong_ui(bufferCount, NULL, 10, - &def->bufferCount) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("cannot parse 'bufferCount' value '%s'"), bufferC= ount); + if (virXMLPropUInt(node, "bufferCount", 10, VIR_XML_PROP_NONE, + &def->bufferCount) < 0) return -1; - } =20 return 0; } --=20 2.26.3