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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2B313E9A745 for ; Tue, 24 Mar 2026 09:20:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w4xw5-0003kk-Nq; Tue, 24 Mar 2026 05:20:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w4xvx-0003jo-Hs for qemu-devel@nongnu.org; Tue, 24 Mar 2026 05:20:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w4xvt-0002q6-Go for qemu-devel@nongnu.org; Tue, 24 Mar 2026 05:20:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774344010; h=from:from:reply-to: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=dKHBWDpGRQQtoPqhVkzq1nl+CF8PjIkk0mmdpOcMluA=; b=ByVycSqrqQUcytOOVNjsT42lHehSA5xg1JbjCgG/NVM/xrhcGhHCQtEiRvGuCq4k62zhl7 0yzyhjE7Kt/8dECdmZTYs4UWU+0/qqGv6xDgc/NmZnliNZv3TK5lq6HKwhO9956LDRIO7H YlozmrKZC7BwzegtX0b9tIJCrtGQRoQ= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-396-GsBNcQiGMG-gKo7Fy5xqoA-1; Tue, 24 Mar 2026 05:20:06 -0400 X-MC-Unique: GsBNcQiGMG-gKo7Fy5xqoA-1 X-Mimecast-MFC-AGG-ID: GsBNcQiGMG-gKo7Fy5xqoA_1774344005 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59BD719560B5; Tue, 24 Mar 2026 09:20:05 +0000 (UTC) Received: from redhat.com (unknown [10.44.33.93]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EA59A1955D71; Tue, 24 Mar 2026 09:20:02 +0000 (UTC) Date: Tue, 24 Mar 2026 09:19:59 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: zhaoguohan@kylinos.cn Cc: Kevin Wolf , Hanna Reitz , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: Re: [PATCH v2] block/curl: factor common cleanup and free password Message-ID: References: <27e0e408-eec9-4507-94f8-d8f9c392dc61@linaro.org> <20260324061345.975935-1-zhaoguohan@kylinos.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260324061345.975935-1-zhaoguohan@kylinos.cn> User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Tue, Mar 24, 2026 at 02:13:45PM +0800, zhaoguohan@kylinos.cn wrote: > From: GuoHan Zhao > > Factor duplicated cleanup code into a helper and reuse it in the > open failure path and curl_close(). > > Also free s->password, fixing a leak. Please don't mix bug fixes with refactorings. These should be separate commits. > Signed-off-by: GuoHan Zhao > --- > block/curl.c | 38 +++++++++++++++++++++++--------------- > 1 file changed, 23 insertions(+), 15 deletions(-) > > diff --git a/block/curl.c b/block/curl.c > index 66aecfb20ec6..577b8d5a4e67 100644 > --- a/block/curl.c > +++ b/block/curl.c > @@ -622,6 +622,27 @@ static void curl_attach_aio_context(BlockDriverState *bs, > curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb); > } > > +static void curl_cleanup(BDRVCURLState *s) > +{ > + g_free(s->cookie); > + s->cookie = NULL; Use this pattern: g_clear_pointer(&s->cookie, g_free); > + g_free(s->url); > + s->url = NULL; > + g_free(s->username); > + s->username = NULL; > + g_free(s->password); > + s->password = NULL; > + g_free(s->proxyusername); > + s->proxyusername = NULL; > + g_free(s->proxypassword); > + s->proxypassword = NULL; > + if (s->sockets) { > + curl_drop_all_sockets(s->sockets); > + g_hash_table_destroy(s->sockets); > + s->sockets = NULL; g_clear_pointer(&s->sockets, g_hash_table_destroy) > + } > +} > + > static QemuOptsList runtime_opts = { > .name = "curl", > .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), > @@ -900,15 +921,7 @@ out: > state->curl = NULL; > out_noclean: > qemu_mutex_destroy(&s->mutex); > - g_free(s->cookie); > - g_free(s->url); > - g_free(s->username); > - g_free(s->proxyusername); > - g_free(s->proxypassword); > - if (s->sockets) { > - curl_drop_all_sockets(s->sockets); > - g_hash_table_destroy(s->sockets); > - } > + curl_cleanup(s); > qemu_opts_del(opts); > return -EINVAL; > } > @@ -1010,12 +1023,7 @@ static void curl_close(BlockDriverState *bs) > curl_detach_aio_context(bs); > qemu_mutex_destroy(&s->mutex); > > - g_hash_table_destroy(s->sockets); > - g_free(s->cookie); > - g_free(s->url); > - g_free(s->username); > - g_free(s->proxyusername); > - g_free(s->proxypassword); > + curl_cleanup(s); > } > > static int64_t coroutine_fn curl_co_getlength(BlockDriverState *bs) > -- > 2.43.0 > > With regards, Daniel -- |: https://berrange.com ~~ https://hachyderm.io/@berrange :| |: https://libvirt.org ~~ https://entangle-photo.org :| |: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|