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,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 E7688C2D0E4 for ; Wed, 25 Nov 2020 01:22:55 +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 541AB20DD4 for ; Wed, 25 Nov 2020 01:22:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 541AB20DD4 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]:59914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khjWH-0006pY-0Y for qemu-devel@archiver.kernel.org; Tue, 24 Nov 2020 20:22:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khjUH-0005tv-4j; Tue, 24 Nov 2020 20:20:49 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khjUF-0002Nm-2A; Tue, 24 Nov 2020 20:20:48 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Cgjk66n9zzkYJd; Wed, 25 Nov 2020 09:20:14 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Wed, 25 Nov 2020 09:20:34 +0800 Message-ID: <5FBDB161.505@huawei.com> Date: Wed, 25 Nov 2020 09:20:33 +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: Raphael Norwitz Subject: Re: [PATCH] vhost-user-scsi: Fix memleaks in vus_proc_req() References: <20201124143727.47037-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, zhang.zhanghailiang@huawei.com, Raphael Norwitz , QEMU , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2020/11/24 23:37, Raphael Norwitz wrote: > On Tue, Nov 24, 2020 at 9:50 AM Alex Chen wrote: >> >> The 'elem' is allocated memory in vu_queue_pop(), and it's memory should be >> freed in all error branchs after vu_queue_pop(). > > s/branchs/branches > >> In addition, in order to free 'elem' memory outside of while(1) loop, move the >> definition of 'elem' to the begin of vus_proc_req(). > > s/begin/beginning > >> >> Reported-by: Euler Robot >> Signed-off-by: Alex Chen > > Other than spelling in the commit message, looks good to me. > Thanks for your review, I will fix it and send patch v2. Thanks, Alex > Reviewed-by: Raphael Norwitz > >> --- >> contrib/vhost-user-scsi/vhost-user-scsi.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c >> index 0f9ba4b2a2..4639440a70 100644 >> --- a/contrib/vhost-user-scsi/vhost-user-scsi.c >> +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c >> @@ -232,6 +232,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx) >> VugDev *gdev; >> VusDev *vdev_scsi; >> VuVirtq *vq; >> + VuVirtqElement *elem = NULL; >> >> assert(vu_dev); >> >> @@ -248,7 +249,6 @@ static void vus_proc_req(VuDev *vu_dev, int idx) >> g_debug("Got kicked on vq[%d]@%p", idx, vq); >> >> while (1) { >> - VuVirtqElement *elem; >> VirtIOSCSICmdReq *req; >> VirtIOSCSICmdResp *rsp; >> >> @@ -288,6 +288,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx) >> >> free(elem); >> } >> + free(elem); >> } >> >> static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started) >> -- >> 2.19.1 >> >> > . >