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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E1C2C56202 for ; Thu, 26 Nov 2020 11:48:52 +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 8400A20678 for ; Thu, 26 Nov 2020 11:48:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8400A20678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiFla-0003c5-G4 for qemu-devel@archiver.kernel.org; Thu, 26 Nov 2020 06:48:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiFdM-0005wF-Ow; Thu, 26 Nov 2020 06:40:20 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiFdJ-0001BX-Oh; Thu, 26 Nov 2020 06:40:20 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4ChbQR0BflzkWsD; Thu, 26 Nov 2020 19:39:43 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Thu, 26 Nov 2020 19:40:04 +0800 Message-ID: <5FBF9413.4050907@huawei.com> Date: Thu, 26 Nov 2020 19:40:03 +0800 From: Alex Chen User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Li Qiang Subject: Re: [PATCH] virtfs-proxy-helper: Fix a resource leak in main() References: <20201126101624.55714-1-alex.chen@huawei.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.190; envelope-from=alex.chen@huawei.com; helo=szxga04-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu-trivial@nongnu.org, zhanghailiang , qemu_oss@crudebyte.com, Greg Kurz , Qemu Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2020/11/26 18:50, Li Qiang wrote: > Alex Chen >> >> Only one of the options -s and -f can be used. When -f is used, >> the fd is created externally and does not need to be closed. >> When -s is used, a new socket fd is created, and this socket fd >> needs to be closed at the end of main(). >> >> Reported-by: Euler Robot >> Signed-off-by: Alex Chen >> --- >> fsdev/virtfs-proxy-helper.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c >> index 15c0e79b06..339d477169 100644 >> --- a/fsdev/virtfs-proxy-helper.c >> +++ b/fsdev/virtfs-proxy-helper.c >> @@ -1154,6 +1154,9 @@ int main(int argc, char **argv) >> process_requests(sock); >> error: >> g_free(rpath); >> + if (sock_name) { >> + close(sock); >> + } > > If 'proxy_socket' failed, you call close(-1). > > Maybe following is better? > > if (sock >= 0) { > close(sock); > } > Hi Qiang, Thanks for your review. The 'sock' need to be closed only when option -s is used, that is when 'sock_name' is not NULL. So maybe the following is better? diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 15c0e79b06..3ba68d9878 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -1154,6 +1154,9 @@ int main(int argc, char **argv) process_requests(sock); error: g_free(rpath); + if (sock_name && (sock >= 0)) { + close(sock); + } g_free(sock_name); do_log(LOG_INFO, "Done\n"); closelog(); Thanks, Alex