From: Haiyang Tan <haiyang.tan.dev@gmail.com>
Date: Sat, 20 Jan 2018 09:01:28 +0000 (-0500)
Subject: vhost_user: 'nregions' saves the actual number of mapped guest physical address area
X-Git-Tag: v18.04-rc1~460
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=352ecd95c9cef74e1726f750dae86c1f97999275;p=vpp.git

vhost_user: 'nregions' saves the actual number of mapped guest physical address area

This patch fixed the VMA leak that if mapping one of guest physical address area get failed.

Change-Id: I07b0b9a932209561d6ff2b2dd08a111ea5db2209
Signed-off-by: Haiyang Tan <haiyang.tan.dev@gmail.com>
---

diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c
index 7470f15b1c3..c7820406538 100644
--- a/src/vnet/devices/virtio/vhost-user.c
+++ b/src/vnet/devices/virtio/vhost-user.c
@@ -852,8 +852,9 @@ vhost_user_socket_read (clib_file_t * uf)
 	    }
 	  vui->region_mmap_addr[i] += vui->regions[i].mmap_offset;
 	  vui->region_mmap_fd[i] = fds[i];
+
+	  vui->nregions++;
 	}
-      vui->nregions = msg.memory.nregions;
       break;
 
     case VHOST_USER_SET_VRING_NUM: