[{"id":1766671,"web_url":"http://patchwork.ozlabs.org/comment/1766671/","msgid":"<20170912040104.GD2774@umbus.fritz.box>","list_archive_url":null,"date":"2017-09-12T04:01:04","subject":"Re: [Qemu-devel] [PATCH] xics: fix several error leaks","submitter":{"id":47,"url":"http://patchwork.ozlabs.org/api/people/47/","name":"David Gibson","email":"david@gibson.dropbear.id.au"},"content":"On Tue, Sep 12, 2017 at 12:04:40AM +0200, Greg Kurz wrote:\n> If object_property_get_link() fails then it allocates an error, which\n> must be freed before returning. The error_get_pretty() function is\n> merely an accessor to the error message and doesn't free anything.\n> \n> The error.h header indicates how to do it right:\n> \n> * Pass an existing error to the caller with the message modified:\n> * error_propagate(errp, err);\n> * error_prepend(errp, \"Could not frobnicate '%s': \", name);\n> \n> Signed-off-by: Greg Kurz \n\nApplied to ppc-for-2.11.\n\n> ---\n> hw/intc/xics.c | 12 ++++++------\n> 1 file changed, 6 insertions(+), 6 deletions(-)\n> \n> diff --git a/hw/intc/xics.c b/hw/intc/xics.c\n> index a84ba51ad8ff..80c33be02e5e 100644\n> --- a/hw/intc/xics.c\n> +++ b/hw/intc/xics.c\n> @@ -306,8 +306,8 @@ static void icp_realize(DeviceState *dev, Error **errp)\n> \n> obj = object_property_get_link(OBJECT(dev), ICP_PROP_XICS, &err);\n> if (!obj) {\n> - error_setg(errp, \"%s: required link '\" ICP_PROP_XICS \"' not found: %s\",\n> - __func__, error_get_pretty(err));\n> + error_propagate(errp, err);\n> + error_prepend(errp, \"required link '\" ICP_PROP_XICS \"' not found: \");\n> return;\n> }\n> \n> @@ -315,8 +315,8 @@ static void icp_realize(DeviceState *dev, Error **errp)\n> \n> obj = object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err);\n> if (!obj) {\n> - error_setg(errp, \"%s: required link '\" ICP_PROP_CPU \"' not found: %s\",\n> - __func__, error_get_pretty(err));\n> + error_propagate(errp, err);\n> + error_prepend(errp, \"required link '\" ICP_PROP_CPU \"' not found: \");\n> return;\n> }\n> \n> @@ -641,8 +641,8 @@ static void ics_base_realize(DeviceState *dev, Error **errp)\n> \n> obj = object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &err);\n> if (!obj) {\n> - error_setg(errp, \"%s: required link '\" ICS_PROP_XICS \"' not found: %s\",\n> - __func__, error_get_pretty(err));\n> + error_propagate(errp, err);\n> + error_prepend(errp, \"required link '\" ICS_PROP_XICS \"' not found: \");\n> return;\n> }\n> ics->xics = XICS_FABRIC(obj);\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=gibson.dropbear.id.au\n\theader.i=@gibson.dropbear.id.au header.b=\"i8iUjWVn\"; \n\tdkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrsNf3Hp2z9s8J\n\tfor ;\n\tTue, 12 Sep 2017 14:33:06 +1000 (AEST)","from localhost ([::1]:33550 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drcsi-0006yL-KZ\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 00:33:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35291)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drcpS-0004fJ-Uk\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 00:29:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drcpP-0005O9-Qs\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 00:29:42 -0400","from ozlabs.org ([103.22.144.67]:60759)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drcpP-0005ML-Fb; Tue, 12 Sep 2017 00:29:39 -0400","by ozlabs.org (Postfix, from userid 1007)\n\tid 3xrsJZ3XX1z9sNV; Tue, 12 Sep 2017 14:29:34 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=gibson.dropbear.id.au; s=201602; t=1505190574;\n\tbh=AyuycCI2JKOXDvekdBRCFUE00QzngUWdPwT6Qd/eJdY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=i8iUjWVnA+wiDAjKx8vUSFIjXqut1HSDYmYhaXiSOWZkfSYNqmA4qfCcER8BXtQk3\n\tNX4mXuOaCoazA2L8uyY0eRCcPwRL7GkQPveF6FIV0b+QkaG7APYXoVmxPfrg9D0O3N\n\tQZPgyom7x6D+auO6YTv2d8XvWEsCc1T4wEtr9j5c=","Date":"Tue, 12 Sep 2017 14:01:04 +1000","From":"David Gibson ","To":"Greg Kurz ","Message-ID":"<20170912040104.GD2774@umbus.fritz.box>","References":"<150516748034.6883.2205624415045931101.stgit@bahia.lan>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"a2FkP9tdjPU2nyhF\"","Content-Disposition":"inline","In-Reply-To":"<150516748034.6883.2205624415045931101.stgit@bahia.lan>","User-Agent":"Mutt/1.8.3 (2017-05-23)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"103.22.144.67","Subject":"Re: [Qemu-devel] [PATCH] xics: fix several error leaks","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-ppc@nongnu.org, qemu-devel@nongnu.org,\n\tCedric Le Goater ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]