From patchwork Thu Jan 23 16:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1228436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ieOkSR7q; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 483WXL6G82z9sNF for ; Fri, 24 Jan 2020 05:49:22 +1100 (AEDT) Received: from localhost ([::1]:35062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuhXc-0004it-1C for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 13:49:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42250) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufea-0005kI-MK for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufeZ-0007j0-Iz for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:24 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53621 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufeZ-0007iN-G3 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qHRBtI8mqc/+h6vY0sDSH8KnWBJyk6xG64HuaxZqdiY=; b=ieOkSR7qli3dmivWRIz9zuXsm3jp9JMYrFU2o6KSgCLtGWhb5QuxrJYk9uJF5h9UvBuCnv 3dDMGEfXqsBNWJJrmlHSvgyZqwQoFq+uYF5nnZt1hT22khzuZO+O2CK/3RbAO20Ugb9h8Y Zsaebvh0t9a8w6X1EksE2ERfvzBsE58= 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-325-wuhlraj7No21MxkWntpDiQ-1; Thu, 23 Jan 2020 11:48:21 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDE8C10883AD for ; Thu, 23 Jan 2020 16:48:20 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 330E728991; Thu, 23 Jan 2020 16:48:20 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 079/108] virtiofsd: fix memory leak on lo.source Date: Thu, 23 Jan 2020 16:46:01 +0000 Message-Id: <20200123164630.91498-80-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: wuhlraj7No21MxkWntpDiQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Liu Bo valgrind reported that lo.source is leaked on quiting, but it was defined as (const char*) as it may point to a const string "/". Signed-off-by: Liu Bo Reviewed-by: Misono Tomohiro Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index af050c6d97..056ebe8556 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -115,7 +115,7 @@ struct lo_data { int writeback; int flock; int xattr; - const char *source; + char *source; double timeout; int cache; int timeout_set; @@ -2497,9 +2497,8 @@ int main(int argc, char *argv[]) fuse_log(FUSE_LOG_ERR, "source is not a directory\n"); exit(1); } - } else { - lo.source = "/"; + lo.source = strdup("/"); } if (!lo.timeout_set) { switch (lo.cache) { @@ -2570,5 +2569,7 @@ err_out1: close(lo.root.fd); } + free(lo.source); + return ret ? 1 : 0; }