Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1khjpQ-0003Ir-1s for mharc-qemu-trivial@gnu.org; Tue, 24 Nov 2020 20:42:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khjpN-0003IP-TL; Tue, 24 Nov 2020 20:42:37 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khjpL-0005Ea-Iu; Tue, 24 Nov 2020 20:42:37 -0500 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CgkCF3BS4zLswf; Wed, 25 Nov 2020 09:42:01 +0800 (CST) Received: from [10.174.187.138] (10.174.187.138) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Wed, 25 Nov 2020 09:42:21 +0800 Message-ID: <5FBDB67C.5090202@huawei.com> Date: Wed, 25 Nov 2020 09:42:20 +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: Alex Chen CC: , , , , Subject: Re: [PATCH v2] vhost-user-scsi: Fix memleaks in vus_proc_req() References: <20201125012543.109997-1-alex.chen@huawei.com> In-Reply-To: <20201125012543.109997-1-alex.chen@huawei.com> 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.191; envelope-from=alex.chen@huawei.com; helo=szxga05-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_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: Wed, 25 Nov 2020 01:42:38 -0000 Sorry, I forgot to add the Reviewed-by information, I will send patch v3. On 2020/11/25 9:25, Alex Chen wrote: > The 'elem' is allocated memory in vu_queue_pop(), and its memory should be > freed in all error branches after vu_queue_pop(). > In addition, in order to free the 'elem' memory outside of while(1) loop, move > the definition of 'elem' to the beginning of vus_proc_req(). > > Reported-by: Euler Robot > Signed-off-by: Alex Chen > --- > 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) >