From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4doj-0001fi-4V for qemu-devel@nongnu.org; Thu, 03 Dec 2015 19:01:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4doh-0000k0-Ve for qemu-devel@nongnu.org; Thu, 03 Dec 2015 19:01:41 -0500 Date: Fri, 4 Dec 2015 10:45:21 +1100 From: David Gibson Message-ID: <20151203234521.GB9559@voom.redhat.com> References: <1449160660-3777-1-git-send-email-armbru@redhat.com> <1449160660-3777-2-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+" Content-Disposition: inline In-Reply-To: <1449160660-3777-2-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-2.5 1/3] spapr_drc: Handle visitor errors properly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: peter.maydell@linaro.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, agraf@suse.de --NMuMz9nt05w80d4+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 03, 2015 at 05:37:38PM +0100, Markus Armbruster wrote: > Since prop_get_fdt() is only used with QmpOutputVisitor, errors > shouldn't actually happen, so this is only a latent bug. >=20 > Signed-off-by: Markus Armbruster Acked-by: David Gibson > --- > hw/ppc/spapr_drc.c | 32 ++++++++++++++++++++++++++------ > 1 file changed, 26 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c > index f34bc04..4e7a1d3 100644 > --- a/hw/ppc/spapr_drc.c > +++ b/hw/ppc/spapr_drc.c > @@ -254,6 +254,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, voi= d *opaque, > const char *name, Error **errp) > { > sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(obj); > + Error *err =3D NULL; > int fdt_offset_next, fdt_offset, fdt_depth; > void *fdt; > =20 > @@ -276,24 +277,43 @@ static void prop_get_fdt(Object *obj, Visitor *v, v= oid *opaque, > case FDT_BEGIN_NODE: > fdt_depth++; > name =3D fdt_get_name(fdt, fdt_offset, &name_len); > - visit_start_struct(v, NULL, NULL, name, 0, NULL); > + visit_start_struct(v, NULL, NULL, name, 0, &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > break; > case FDT_END_NODE: > /* shouldn't ever see an FDT_END_NODE before FDT_BEGIN_NODE = */ > g_assert(fdt_depth > 0); > - visit_end_struct(v, NULL); > + visit_end_struct(v, &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > fdt_depth--; > break; > case FDT_PROP: { > int i; > prop =3D fdt_get_property_by_offset(fdt, fdt_offset, &prop_l= en); > name =3D fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); > - visit_start_list(v, name, NULL); > + visit_start_list(v, name, &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > for (i =3D 0; i < prop_len; i++) { > - visit_type_uint8(v, (uint8_t *)&prop->data[i], NULL, NUL= L); > - > + visit_type_uint8(v, (uint8_t *)&prop->data[i], NULL, &er= r); > + if (err) { > + error_propagate(errp, err); > + return; > + } > + } > + visit_end_list(v, &err); > + if (err) { > + error_propagate(errp, err); > + return; > } > - visit_end_list(v, NULL); > break; > } > default: --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --NMuMz9nt05w80d4+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWYNQRAAoJEGw4ysog2bOS5ugP/R+nAGNwVVTWW49ANkfiJjej 91xcoeA1H8JaOORvI2Tkcy+Pd3nLOUAcZP4woZiKdoCo+Swb+Txghk0xvjFJiO1d XRskD+V3dPrOoiQNr33+dE5ieY3lXSb4LTbCGNbrdeTz9pmz/R6y1sk+SJu5WnKs 9iuBbhBRUpi7Yq/fBsmzQQlg++9N8ox7XSedCNuj7/LP3VRlAjhat8pWrHmxOSRx NBYUb5HAtJHWZfuWYBa+43EuFC7BQypEki+3EEkIhMJK0PS+oRlq+wbWERwyrSpu AnOUuVe470fQd8RVfNogkxR2O3KAnMwbIs79IXCvsz7aVoPAEQhIAr2p98TDfcyR hQVc1dXvTi30lc47XyAKZ0KUyBbElvR6d5ugG2C/b7qyoz/v03raSnQrE4aZyBwu oN0pNtBaxfI/VNQQTGZruz3uY1dZixZo2tn9yaXfESpRtrER49xl339kzay9uZln cGD8qTFBTs+AgoLhPx36PP0EncirLBzeh8CO5ZXJHK/2yZXKQQdZHzd2b/QiTSYE fob0voyDERUmWD5P5vD3TDqP7bDuQJSre9yRmuMaG5xbguSGTONEj5CnGyu/X4a7 q4GCoj+fq4PNm+poAf8b1up37eNf2CcbROoctNJQUkEtTbXUTmxGE9peWj5l67Fv Id926MWxzcvGBL0N0kCH =jTID -----END PGP SIGNATURE----- --NMuMz9nt05w80d4+--