From nobody Sun May 5 01:59:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551975931280224.58128740827453; Thu, 7 Mar 2019 08:25:31 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 59696307E042; Thu, 7 Mar 2019 16:25:29 +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 806CC6013F; Thu, 7 Mar 2019 16:25:28 +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 67396181A136; Thu, 7 Mar 2019 16:25:27 +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 x27GPQIA024374 for ; Thu, 7 Mar 2019 11:25:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 36B98608C1; Thu, 7 Mar 2019 16:25:26 +0000 (UTC) Received: from unknown0050b6a41c42.attlocal.net.com (ovpn-116-58.phx2.redhat.com [10.3.116.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id E636060856 for ; Thu, 7 Mar 2019 16:25:21 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Thu, 7 Mar 2019 11:25:18 -0500 Message-Id: <20190307162518.9925-1-jferlan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] conf: Remove unnecessary @ctxt check in virSecurityLabelDefsParseXML 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 07 Mar 2019 16:25:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Failure would have occurred before in callers other virXPath calls. Found by Coverity due to commit 66a508d2 using VIR_XPATH_NODE_AUTORESTORE to access @ctxt before the if condition. Signed-off-by: John Ferlan Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index eb660f5764..dc57b23084 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8516,8 +8516,7 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, virCapsHostPtr host =3D &caps->host; VIR_AUTOFREE(xmlNodePtr *) list =3D NULL; =20 - /* Check args and save context */ - if (def =3D=3D NULL || ctxt =3D=3D NULL) + if (def =3D=3D NULL) return 0; =20 /* Allocate a security labels based on XML */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list