vhost: fix zmbufs array leak after NUMA realloc
authorIlya Maximets <i.maximets@samsung.com>
Wed, 15 Aug 2018 14:54:39 +0000 (17:54 +0300)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 12 Sep 2018 17:10:09 +0000 (19:10 +0200)
'numa_realloc()' allocates 'zmbufs' even if zero copy mode
is not configured. This leads to memory leak, because array
is freed only for zero copy case.

Fixes: 2651726defb7 ("vhost: do deep copy while reallocating queue")
CC: stable@dpdk.org
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
lib/librte_vhost/vhost_user.c

index a2d4c9f..9aa1ce1 100644 (file)
@@ -357,11 +357,13 @@ numa_realloc(struct virtio_net *dev, int index)
                memcpy(vq, old_vq, sizeof(*vq));
                TAILQ_INIT(&vq->zmbuf_list);
 
-               new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
-                       sizeof(struct zcopy_mbuf), 0, newnode);
-               if (new_zmbuf) {
-                       rte_free(vq->zmbufs);
-                       vq->zmbufs = new_zmbuf;
+               if (dev->dequeue_zero_copy) {
+                       new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
+                                       sizeof(struct zcopy_mbuf), 0, newnode);
+                       if (new_zmbuf) {
+                               rte_free(vq->zmbufs);
+                               vq->zmbufs = new_zmbuf;
+                       }
                }
 
                if (vq_is_packed(dev)) {