diff options
| author | Yuval Shaia <yuval.shaia@oracle.com> | 2019-01-16 17:15:38 +0200 |
|---|---|---|
| committer | Marcel Apfelbaum <marcel.apfelbaum@gmail.com> | 2019-01-19 10:54:37 +0200 |
| commit | a1aa88b7dcac2b22d74908f9276d5d145d8e65a0 (patch) | |
| tree | 3f3952ec6c4b83f25fc4949bfe3ab559e937f0a9 /hw/rdma | |
| parent | 5bb8b739879f255fb3587238611334584ddcd99b (diff) | |
| download | qemu-a1aa88b7dcac2b22d74908f9276d5d145d8e65a0.zip qemu-a1aa88b7dcac2b22d74908f9276d5d145d8e65a0.tar.gz qemu-a1aa88b7dcac2b22d74908f9276d5d145d8e65a0.tar.bz2 | |
hw/rdma: Verify that ptr is not NULL before freeing
To cover the case where fini() was called even when init() fails make
sure objects are not NULL before calling to non-null-safe destructors.
Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190116151538.14088-1-yuval.shaia@oracle.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Diffstat (limited to 'hw/rdma')
| -rw-r--r-- | hw/rdma/rdma_backend.c | 6 | ||||
| -rw-r--r-- | hw/rdma/rdma_rm.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index b49edaa..3ee5172 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -1066,8 +1066,10 @@ static void mad_fini(RdmaBackendDev *backend_dev) pr_dbg("Stopping MAD\n"); disable_rdmacm_mux_async(backend_dev); qemu_chr_fe_disconnect(backend_dev->rdmacm_mux.chr_be); - qlist_destroy_obj(QOBJECT(backend_dev->recv_mads_list.list)); - qemu_mutex_destroy(&backend_dev->recv_mads_list.lock); + if (backend_dev->recv_mads_list.list) { + qlist_destroy_obj(QOBJECT(backend_dev->recv_mads_list.list)); + qemu_mutex_destroy(&backend_dev->recv_mads_list.lock); + } } int rdma_backend_get_gid_index(RdmaBackendDev *backend_dev, diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index f5b1295..8bf241e 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -41,6 +41,9 @@ static inline void res_tbl_init(const char *name, RdmaRmResTbl *tbl, static inline void res_tbl_free(RdmaRmResTbl *tbl) { + if (!tbl->bitmap) { + return; + } qemu_mutex_destroy(&tbl->lock); g_free(tbl->tbl); g_free(tbl->bitmap); @@ -655,5 +658,7 @@ void rdma_rm_fini(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, res_tbl_free(&dev_res->cq_tbl); res_tbl_free(&dev_res->pd_tbl); - g_hash_table_destroy(dev_res->qp_hash); + if (dev_res->qp_hash) { + g_hash_table_destroy(dev_res->qp_hash); + } } |