From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D184EC433EF for ; Fri, 15 Oct 2021 07:27:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99AE661041 for ; Fri, 15 Oct 2021 07:27:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 99AE661041 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:56812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbHcl-0004Sq-Kc for qemu-devel@archiver.kernel.org; Fri, 15 Oct 2021 03:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbHbX-0002tt-9f for qemu-devel@nongnu.org; Fri, 15 Oct 2021 03:26:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbHbV-0002ao-Cz for qemu-devel@nongnu.org; Fri, 15 Oct 2021 03:26:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634282768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S4XxTpVEWUGaarhqoembW9qf+Gi5ZWDvl3SDXOLpMhU=; b=FjyO5t2MswXDU0zVz/+w+yFLwEnib3H297xd7NljRpldUBLjdTybXAvWY4ARnFqu0P3mKZ btCkO2mCxTk7prkHXns93UCmwYDD3LnRAgxuxJS9YzIZlmvdM1u98v2eQPvaEvXCHg9SvV Qnhh3hdliNKJ13OXkHbJmdILoPb961c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-217-eeXWU9AKNry2VUWWVdBN2g-1; Fri, 15 Oct 2021 03:26:05 -0400 X-MC-Unique: eeXWU9AKNry2VUWWVdBN2g-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B734E1018F60; Fri, 15 Oct 2021 07:26:03 +0000 (UTC) Received: from redhat.com (unknown [10.39.193.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C69F4B857C; Fri, 15 Oct 2021 07:24:47 +0000 (UTC) Date: Fri, 15 Oct 2021 09:24:46 +0200 From: Kevin Wolf To: Eric Blake Subject: Re: [PATCH v2 09/15] softmmu/qdev-monitor: add error handling in qdev_set_id Message-ID: References: <20211008133442.141332-1-kwolf@redhat.com> <20211008133442.141332-10-kwolf@redhat.com> <20211011210025.kq4qjwn7kzfcwwl5@redhat.com> <5a732276-a974-1a8c-7f45-921713454bfa@greensocs.com> <20211013213744.dv46wd7qc3zv2li2@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211013213744.dv46wd7qc3zv2li2@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , lvivier@redhat.com, pkrempa@redhat.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, mst@redhat.com, libvir-list@redhat.com, jasowang@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, vsementsov@virtuozzo.com, its@irrelevant.dk, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 13.10.2021 um 23:37 hat Eric Blake geschrieben: > On Wed, Oct 13, 2021 at 03:10:38PM +0200, Damien Hedde wrote: > > > > @@ -691,7 +703,13 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) > > > > } > > > > } > > > > - qdev_set_id(dev, g_strdup(qemu_opts_id(opts))); > > > > + /* > > > > + * set dev's parent and register its id. > > > > + * If it fails it means the id is already taken. > > > > + */ > > > > + if (!qdev_set_id(dev, g_strdup(qemu_opts_id(opts)), errp)) { > > > > + goto err_del_dev; > > > > > > ...nor on this, which means the g_strdup() leaks on failure. > > > > > > > Since we strdup the id just before calling qdev_set_id. > > Maybe we should do the the strdup in qdev_set_id (and free things on error > > there too). It seems simplier than freeing things on the callee side just in > > case of an error. > > Indeed. If we expected qdev_set_id() to be passed something that it > can later free, we would have used 'char *'; but because we used > 'const char *' for that parameter, it really does make more sense for > the callers to pass in any string and for qdev_set_id() to do the > necessary strdup()ing, as well as clean up on error. Since this seems to be the only thing in the series that needs to be addressed, I'll do the minimal fix while applying (adding g_free() to the error path in qemu_opts_id()) and then we can clean up on top. Kevin