From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E9C581B4F5; Tue, 9 Oct 2018 13:47:29 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA6FF30820C1; Tue, 9 Oct 2018 11:47:28 +0000 (UTC) Received: from [10.36.112.57] (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A0156A957; Tue, 9 Oct 2018 11:47:22 +0000 (UTC) To: Tiwei Bie Cc: dev@dpdk.org, zhihong.wang@intel.com, jfreimann@redhat.com, nicknickolaev@gmail.com, i.maximets@samsung.com, bruce.richardson@intel.com, alejandro.lucero@netronome.com, dgilbert@redhat.com, stable@dpdk.org References: <20181008152557.14275-1-maxime.coquelin@redhat.com> <20181008152557.14275-6-maxime.coquelin@redhat.com> <20181009113541.GA1548@debian> From: Maxime Coquelin Message-ID: Date: Tue, 9 Oct 2018 13:47:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181009113541.GA1548@debian> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 09 Oct 2018 11:47:29 +0000 (UTC) Subject: Re: [dpdk-dev] [PATCH v4 05/19] vhost: fix error handling when mem table gets updated X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 11:47:30 -0000 On 10/09/2018 01:35 PM, Tiwei Bie wrote: > On Mon, Oct 08, 2018 at 05:25:43PM +0200, Maxime Coquelin wrote: >> When the memory table gets updated, the rings addresses need >> to be translated again. If it fails, we need to exit cleanly >> by unmapping memory regions. >> >> Fixes: d5022533c20a ("vhost: retranslate vring addr when memory table changes") >> Cc: stable@dpdk.org >> >> Signed-off-by: Maxime Coquelin >> Acked-by: Ilya Maximets >> --- >> lib/librte_vhost/vhost_user.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c >> index 71a0e7dd7..3f01926e2 100644 >> --- a/lib/librte_vhost/vhost_user.c >> +++ b/lib/librte_vhost/vhost_user.c >> @@ -964,7 +964,7 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg) >> >> dev = translate_ring_addresses(dev, i); >> if (!dev) >> - return VH_RESULT_ERR; >> + goto err_mmap; > > When dev is NULL, we can't just goto err_mmap directly, > otherwise we will dereference the NULL pointer. Indeed, thanks for catching it. I think we should restore dev to *pdev value. >> >> *pdev = dev; >> } >> -- >> 2.17.1 >>