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 D3374C677C4 for ; Wed, 11 Jun 2025 10:22:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uPIao-0002IN-Dk; Wed, 11 Jun 2025 06:22:02 -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 1uPIal-0002I0-6o for qemu-devel@nongnu.org; Wed, 11 Jun 2025 06:21:59 -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 1uPIai-0007o3-OC for qemu-devel@nongnu.org; Wed, 11 Jun 2025 06:21:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749637314; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uwLlux5H/YRM2HSHed8w5y5i6BkAfHYqiPll5yJqsfM=; b=ToYxZiJXVSnzd/E4JhJe8gVzXgPb3+pgY8RkNpGFBU7MZbL2FruHyfGwvj3YHEPgIcnUzA 45bs6K8WshJsVX2gXx+2itZ6ljb4TuBl2k04rvI6A2g2TtVdMt0a+GX2gpSVE/Durjj3w3 JQKbTffkEgEbBYHxuPxJXMFYYc/Vcdo= Received: from mx-prod-mc-05.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-246-tyvyTdTBOGiA4ptM5FCGjA-1; Wed, 11 Jun 2025 06:21:50 -0400 X-MC-Unique: tyvyTdTBOGiA4ptM5FCGjA-1 X-Mimecast-MFC-AGG-ID: tyvyTdTBOGiA4ptM5FCGjA_1749637310 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DA49A1956080; Wed, 11 Jun 2025 10:21:49 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.140]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A4C391800285; Wed, 11 Jun 2025 10:21:47 +0000 (UTC) Date: Wed, 11 Jun 2025 11:21:43 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: qemu-devel@nongnu.org Cc: Laurent Vivier Subject: Re: [PATCH v2] linux-user: fix resource leaks in gen-vdso Message-ID: References: <20250513150346.1328217-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250513150346.1328217-1-berrange@redhat.com> User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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_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.29 Precedence: list List-Id: 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 Ping for review/acks On Tue, May 13, 2025 at 04:03:46PM +0100, Daniel P. Berrangé wrote: > There are a number of resource leaks in gen-vdso. In theory they are > harmless because this is a short lived process, but when building QEMU > with --extra-cflags="-fsanitize=address" problems ensure. The gen-vdso > program is run as part of the build, and that aborts due to the > sanitizer identifying memory leaks, leaving QEMU unbuildable. > > FAILED: libqemu-x86_64-linux-user.a.p/vdso.c.inc > /var/home/berrange/src/virt/qemu/build/linux-user/gen-vdso -o libqemu-x86_64-linux-user.a.p/vdso.c.inc ../linux-user/x86_64/vdso.so > > ================================================================= > ==1696332==ERROR: LeakSanitizer: detected memory leaks > > Direct leak of 2968 byte(s) in 1 object(s) allocated from: > #0 0x56495873f1f3 (/var/home/berrange/src/virt/qemu/build/linux-user/gen-vdso+0xa11f3) (BuildId: b69e241ad44719b6f3934f3c71dfc6727e8bdb12) > #1 0x564958780b90 (/var/home/berrange/src/virt/qemu/build/linux-user/gen-vdso+0xe2b90) (BuildId: b69e241ad44719b6f3934f3c71dfc6727e8bdb12) > > This complaint is about the 'buf' variable, however, the FILE objects > are also leaked in some error scenarios, so this fix refactors the > cleanup paths to fix all leaks. For completeness it also reports an > error if fclose() fails on 'inf'. > > Signed-off-by: Daniel P. Berrangé > --- > > Changed in v2: > > - Add missing braces > > linux-user/gen-vdso.c | 27 ++++++++++++++++----------- > 1 file changed, 16 insertions(+), 11 deletions(-) > > diff --git a/linux-user/gen-vdso.c b/linux-user/gen-vdso.c > index 721f38d5a3..fce9d5cbc3 100644 > --- a/linux-user/gen-vdso.c > +++ b/linux-user/gen-vdso.c > @@ -56,13 +56,14 @@ static unsigned rt_sigreturn_addr; > > int main(int argc, char **argv) > { > - FILE *inf, *outf; > + FILE *inf = NULL, *outf = NULL; > long total_len; > const char *prefix = "vdso"; > const char *inf_name; > const char *outf_name = NULL; > - unsigned char *buf; > + unsigned char *buf = NULL; > bool need_bswap; > + int ret = EXIT_FAILURE; > > while (1) { > int opt = getopt(argc, argv, "o:p:r:s:"); > @@ -129,7 +130,6 @@ int main(int argc, char **argv) > fprintf(stderr, "%s: incomplete read\n", inf_name); > return EXIT_FAILURE; > } > - fclose(inf); > > /* > * Identify which elf flavor we're processing. > @@ -205,19 +205,24 @@ int main(int argc, char **argv) > fprintf(outf, " .rt_sigreturn_ofs = 0x%x,\n", rt_sigreturn_addr); > fprintf(outf, "};\n"); > > - /* > - * Everything should have gone well. > - */ > - if (fclose(outf)) { > - goto perror_outf; > + ret = EXIT_SUCCESS; > + > + cleanup: > + free(buf); > + > + if (outf && fclose(outf) != 0) { > + ret = EXIT_FAILURE; > + } > + if (inf && fclose(inf) != 0) { > + ret = EXIT_FAILURE; > } > - return EXIT_SUCCESS; > + return ret; > > perror_inf: > perror(inf_name); > - return EXIT_FAILURE; > + goto cleanup; > > perror_outf: > perror(outf_name); > - return EXIT_FAILURE; > + goto cleanup; > } > -- > 2.49.0 > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|