From nobody Sun Feb 8 20:23:55 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=1637601309; cv=none; d=zohomail.com; s=zohoarc; b=felnrjk3H2yq5y89unxVOhKHRmvhIayaQI4cOU2ttXEjM28axzyelf0S3g3pR+iKsnXYGSUc7h39qRgABDoYxYhl2H95J0AGa92WDnwjWfEBJsSYHsgyiitOjwRgzcmq8bFHDsuupzaI5GzqS+mhumIBFH3rxIJKmF0y9pcr/cQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637601309; h=Content-Type:Content-Transfer-Encoding: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=i4Jf19PV9pcAU7GGxor7u5VwDHlaIaDFtwHIYnuR3Ts=; b=Q7ffuUODlzCz2bW4AWm97gtrxrfJTzMvtdF7IVKflX224OcLE4Bs3tqPCeU8f8u1dnHgVTjQ0cOfoD1r5SIv++rj3Qpf6yK7/mgWGtBwpleEQ8NCAsFOXbuZ4Zc6JQ9OvV9HJVr9ClXOW8mVx7sKBUzyTaKI/xsM6S68XArZBjU= 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) 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 1637601309567423.3386640923642; Mon, 22 Nov 2021 09:15:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-342-XVyN7xcEPAGPWBrxpOXGfA-1; Mon, 22 Nov 2021 12:13:19 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF6231923782; Mon, 22 Nov 2021 17:13:14 +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 7E39D10023AB; Mon, 22 Nov 2021 17:13:14 +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 49B364EA38; Mon, 22 Nov 2021 17:13:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AMHClhW029366 for ; Mon, 22 Nov 2021 12:12:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5E95960C5F; Mon, 22 Nov 2021 17:12:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2B6D60FFD for ; Mon, 22 Nov 2021 17:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637601308; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i4Jf19PV9pcAU7GGxor7u5VwDHlaIaDFtwHIYnuR3Ts=; b=LA4lOzMES/ls0lb9VtvWv/2MibdFVXvxTPbSMeMOY4rKYsfDbwTZ72y+IbmTaWax/e1Idr UFIdTBlrFpNNOiF8QiJiIc8VvB/thS6bZv1sr4tVMvPEJpmG537mduTzZPQJ+RRhz0ZnuQ P3fCgj/F+QDqNFPmBUnfejKMcNqC4BI= X-MC-Unique: XVyN7xcEPAGPWBrxpOXGfA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/12] virSecurityDeviceLabelDefParseXML: Don't use 'virXPathStringLimit' Date: Mon, 22 Nov 2021 18:12:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.22 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) X-ZM-MESSAGEID: 1637601311741100001 Content-Type: text/plain; charset="utf-8" virXPathStringLimit doesn't give callers a way to differentiate between the queried XPath being empty and the length limit being exceeded. This means that the callers is completely ignoring the error. Move the length check into the caller. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e829511ac5..d6eefed398 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8066,9 +8066,10 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceL= abelDef ***seclabels_rtn, ignore_value(virStringParseYesNo(labelskip, &seclabels[i]->lab= elskip)); ctxt->node =3D list[i]; - label =3D virXPathStringLimit("string(./label)", - VIR_SECURITY_LABEL_BUFLEN-1, ctxt); - seclabels[i]->label =3D g_steal_pointer(&label); + label =3D virXPathString("string(./label)", ctxt); + + if (label && strlen(label) < VIR_SECURITY_LABEL_BUFLEN) + seclabels[i]->label =3D g_steal_pointer(&label); if (seclabels[i]->label && !seclabels[i]->relabel) { virReportError(VIR_ERR_XML_ERROR, --=20 2.31.1