[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH PULL 06/10] hw/rdma: Verify that ptr is not NULL bef
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH PULL 06/10] hw/rdma: Verify that ptr is not NULL before freeing |
Date: |
Sat, 19 Jan 2019 12:03:11 +0200 |
From: Yuval Shaia <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/rdma/rdma_backend.c | 6 ++++--
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 b49edaacaf..3ee5172c96 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 f5b1295890..8bf241e91f 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);
+ }
}
--
2.17.1
- [Qemu-devel] [PATCH PULL 00/10] RDMA queue, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 01/10] docs/pvrdma: Update rdmacm-mux documentation, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 09/10] hw/rdma: modify struct initialization, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 05/10] hw/pvrdma: Make function pvrdma_qp_send/recv return void., Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 07/10] hw: rdma: fix an off-by-one issue, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 08/10] contrib/rdmacm-mux: remove Wno-format-truncation flag, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 06/10] hw/rdma: Verify that ptr is not NULL before freeing,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH PULL 04/10] hw/pvrdma: Post CQE when receive invalid gid index, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 03/10] hw/rdma: Delete unused struct member, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 02/10] hw/pvrdma: Remove max-sge command-line param, Marcel Apfelbaum, 2019/01/19
- [Qemu-devel] [PATCH PULL 10/10] contrib/rdmacm-mux: fix clang compilation, Marcel Apfelbaum, 2019/01/19
- Re: [Qemu-devel] [PATCH PULL 00/10] RDMA queue, 李强, 2019/01/20
- Re: [Qemu-devel] [PATCH PULL 00/10] RDMA queue, Peter Maydell, 2019/01/22