From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 5E9B91B4EB; Tue, 9 Oct 2018 13:37:00 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2018 04:36:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,360,1534834800"; d="scan'208";a="97785989" Received: from btwcube1.sh.intel.com (HELO debian) ([10.67.104.158]) by orsmga001.jf.intel.com with ESMTP; 09 Oct 2018 04:36:56 -0700 Date: Tue, 9 Oct 2018 19:35:41 +0800 From: Tiwei Bie To: Maxime Coquelin 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 Message-ID: <20181009113541.GA1548@debian> References: <20181008152557.14275-1-maxime.coquelin@redhat.com> <20181008152557.14275-6-maxime.coquelin@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181008152557.14275-6-maxime.coquelin@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) 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:37:00 -0000 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. > > *pdev = dev; > } > -- > 2.17.1 >