From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kepYn-0005UL-Hw for mharc-qemu-trivial@gnu.org; Mon, 16 Nov 2020 20:13:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kepYk-0005Tw-JK; Mon, 16 Nov 2020 20:13:26 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kepYh-0000zx-Np; Mon, 16 Nov 2020 20:13:26 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CZnxK0dBqzLlmn; Tue, 17 Nov 2020 09:12:53 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Tue, 17 Nov 2020 09:13:02 +0800 Message-ID: <5FB3239E.6030709@huawei.com> Date: Tue, 17 Nov 2020 09:13:02 +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: Thomas Huth , =?UTF-8?B?QWxleCBCZW5uw6ll?= CC: , Laurent Vivier , , , , , Subject: Re: [PATCH 2/2] plugins: Fix two resource leaks in connect_socket() References: <5F9975F1.4080205@huawei.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 20:13:14 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] 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_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-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2020 01:13:26 -0000 On 2020/11/17 0:50, Thomas Huth wrote: > On 28/10/2020 14.45, AlexChen wrote: >> Either accept() fails or exits normally, we need to close the fd. >> >> Reported-by: Euler Robot >> Signed-off-by: AlexChen >> --- >> contrib/plugins/lockstep.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c >> index 319bd44b83..5aad50869d 100644 >> --- a/contrib/plugins/lockstep.c >> +++ b/contrib/plugins/lockstep.c >> @@ -268,11 +268,13 @@ static bool setup_socket(const char *path) >> socket_fd = accept(fd, NULL, NULL); > > I think you could also simply close(fd) here instead, then you don't have to > do it twice below. > Hi Thomas and Alex, Thanks for your suggestion. It's a simple and effective solution. Considering that the patch v3 has been queued by Alex Bennée, May I modify this patch and then send patch v4? Thanks, Alex > >> if (socket_fd < 0 && errno != EINTR) { >> perror("accept socket"); >> + close(fd); >> return false; >> } >> >> qemu_plugin_outs("setup_socket::ready\n"); >> >> + close(fd); >> return true; >> } >> > > . > 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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 71F50C388F9 for ; Tue, 17 Nov 2020 01:14:16 +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 BDF4024686 for ; Tue, 17 Nov 2020 01:14:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDF4024686 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]:47394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kepZW-0005va-KW for qemu-devel@archiver.kernel.org; Mon, 16 Nov 2020 20:14:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kepYk-0005Tw-JK; Mon, 16 Nov 2020 20:13:26 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kepYh-0000zx-Np; Mon, 16 Nov 2020 20:13:26 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CZnxK0dBqzLlmn; Tue, 17 Nov 2020 09:12:53 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.487.0; Tue, 17 Nov 2020 09:13:02 +0800 Message-ID: <5FB3239E.6030709@huawei.com> Date: Tue, 17 Nov 2020 09:13:02 +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: Thomas Huth , =?UTF-8?B?QWxleCBCZW5uw6ll?= Subject: Re: [PATCH 2/2] plugins: Fix two resource leaks in connect_socket() References: <5F9975F1.4080205@huawei.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.187.138] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=alex.chen@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 20:13:14 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] 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_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: zhang.zhanghailiang@huawei.com, qemu-trivial@nongnu.org, mjt@tls.msk.ru, Laurent Vivier , qemu-devel@nongnu.org, zhengchuan@huawei.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2020/11/17 0:50, Thomas Huth wrote: > On 28/10/2020 14.45, AlexChen wrote: >> Either accept() fails or exits normally, we need to close the fd. >> >> Reported-by: Euler Robot >> Signed-off-by: AlexChen >> --- >> contrib/plugins/lockstep.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c >> index 319bd44b83..5aad50869d 100644 >> --- a/contrib/plugins/lockstep.c >> +++ b/contrib/plugins/lockstep.c >> @@ -268,11 +268,13 @@ static bool setup_socket(const char *path) >> socket_fd = accept(fd, NULL, NULL); > > I think you could also simply close(fd) here instead, then you don't have to > do it twice below. > Hi Thomas and Alex, Thanks for your suggestion. It's a simple and effective solution. Considering that the patch v3 has been queued by Alex Bennée, May I modify this patch and then send patch v4? Thanks, Alex > >> if (socket_fd < 0 && errno != EINTR) { >> perror("accept socket"); >> + close(fd); >> return false; >> } >> >> qemu_plugin_outs("setup_socket::ready\n"); >> >> + close(fd); >> return true; >> } >> > > . >