From nobody Tue Apr 30 16:19:44 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149519754680542.60658895613358; Fri, 19 May 2017 05:39:06 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id D234E80469; Fri, 19 May 2017 12:39:03 +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 95A8B171A2; Fri, 19 May 2017 12:39:03 +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 3267C180BAF1; Fri, 19 May 2017 12:39:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4JCd2YL029190 for ; Fri, 19 May 2017 08:39:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 375CA171A2; Fri, 19 May 2017 12:39:02 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FDF15C546 for ; Fri, 19 May 2017 12:39:02 +0000 (UTC) Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C342180C14 for ; Fri, 19 May 2017 12:39:00 +0000 (UTC) Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v4JCcxAK003676 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 May 2017 12:38:59 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v4JCcxcm006438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 May 2017 12:38:59 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v4JCcwAg007163; Fri, 19 May 2017 12:38:59 GMT Received: from nina.dynamic.ziggo.nl (/10.175.178.71) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 19 May 2017 05:38:58 -0700 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D234E80469 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=oracle.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D234E80469 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C342180C14 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=oracle.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=wim.ten.have@oracle.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C342180C14 From: Wim Ten Have To: Libvirt Development List Date: Fri, 19 May 2017 14:38:45 +0200 Message-Id: <20170519123845.2859-2-wim.ten.have@oracle.com> In-Reply-To: <20170519123845.2859-1-wim.ten.have@oracle.com> References: <20170519123845.2859-1-wim.ten.have@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 203 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 19 May 2017 12:39:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 19 May 2017 12:39:01 +0000 (UTC) for IP:'156.151.31.81' DOMAIN:'userp1040.oracle.com' HELO:'userp1040.oracle.com' FROM:'wim.ten.have@oracle.com' RCPT:'' X-RedHat-Spam-Score: -101.621 (BAYES_50, DCC_REPUT_13_19, RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RP_MATCHES_RCVD, SPF_PASS, UNPARSEABLE_RELAY, USER_IN_WHITELIST) 156.151.31.81 userp1040.oracle.com 156.151.31.81 userp1040.oracle.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Wim ten Have Subject: [libvirt] [PATCH v1] xenParseXLDiskSrc: protect against a NULL pointer reference 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 19 May 2017 12:39:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Wim ten Have Working larger code changes whilst testing functionality and domxml conversion methodology for xen-xl (xenconfig) a cumbersome caveat surfaced that potentially can take libvirtd out with a SEGV when parsing complex disk xl.cfg directives. This patch also includes tests/xlconfigdata adjustments to illustrate specific disk xl.cfg directive and that way updating test 2-ways. Running the tests with defensive code fix all will run without trouble, running it without the code fix testing will trap with below listed debug transcript. VIR_TEST_DEBUG=3D1 ./run gdb ./tests/xlconfigtest TEST: xlconfigtest 1) Xen XL-2-XML Parse fullvirt-ovmf ... OK 2) Xen XL-2-XML Format fullvirt-ovmf ... OK 3) Xen XL-2-XML Parse paravirt-maxvcpus ... OK 4) Xen XL-2-XML Format paravirt-maxvcpus ... OK 5) Xen XL-2-XML Parse new-disk ... OK 6) Xen XL-2-XML Format new-disk ... OK 7) Xen XL-2-XML Format disk-positional-parms-full ... OK 8) Xen XL-2-XML Format disk-positional-parms-partial ... Program receive= d signal SIGSEGV, Segmentation fault. (gdb) where xlcfg=3D0x66d2b0 "/home/wtenhave/WORK/libvirt/XOSS/BUGS/libvirt/tests/x= lconfigdata/test-disk-positional-parms-partial.cfg", xml=3D0x66d320 "/home/wtenhave/WORK/libvirt/XOSS/BUGS/libvirt/tests/xlc= onfigdata/test-disk-positional-parms-partial.xml", replaceVars=3Dfalse) at = xlconfigtest.c:152 body=3D0x40f32d , data=3D0x7fffffffd990) at testutil= s.c:180 (gdb) frame 1 319 if (STRPREFIX(srcstr, "rbd:")) { (gdb) print srcstr $1 =3D 0x0 Signed-off-by: Wim ten Have --- src/xenconfig/xen_xl.c | 3 ++- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 4f24d45..958956a 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -316,7 +316,8 @@ xenParseXLDiskSrc(virDomainDiskDefPtr disk, char *srcst= r) char *tmpstr =3D NULL; int ret =3D -1; =20 - if (STRPREFIX(srcstr, "rbd:")) { + if (srcstr && + STRPREFIX(srcstr, "rbd:")) { if (!(tmpstr =3D virStringReplace(srcstr, "\\\\", "\\"))) goto cleanup; =20 diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg b/te= sts/xlconfigdata/test-disk-positional-parms-partial.cfg index fd16db0..940304e 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg @@ -22,4 +22,4 @@ parallel =3D "none" serial =3D "none" builder =3D "hvm" boot =3D "d" -disk =3D [ "/dev/HostVG/XenGuest2,,hda,,backendtype=3Dphy", "/var/lib/libv= irt/images/XenGuest2-home,,hdb,,", "/root/boot.iso,,hdc,,devtype=3Dcdrom" ] +disk =3D [ "/dev/HostVG/XenGuest2,,hda,,backendtype=3Dphy", "/var/lib/libv= irt/images/XenGuest2-home,,hdb,,", "/root/boot.iso,,hdc,,devtype=3Dcdrom" ,= "format=3Draw,vdev=3Dhdd,access=3Dro,devtype=3Dcdrom" ] diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/te= sts/xlconfigdata/test-disk-positional-parms-partial.xml index e86a5be..52b21dc 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml @@ -39,6 +39,12 @@
+ + + + +
+ --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list