diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-06-16 13:01:37 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-07-26 16:04:29 +0000 |
| commit | c629928b25ccf55ebdf4cef20ae148daa1d8db67 (patch) | |
| tree | 80640104983b2544030efdb3f5d8312d1fa05904 /sys/ofed | |
| parent | c254f79d9ae794f3e0353f2a9cb94acd288a82a2 (diff) | |
| download | src-c629928b25ccf55ebdf4cef20ae148daa1d8db67.tar.gz src-c629928b25ccf55ebdf4cef20ae148daa1d8db67.zip | |
ibcore: Fix memory leak in cm_req_handler error flows.
In the cm_req_handler() error flows, sometimes cm_id_priv->timewait_info
isn't free'd.
Linux commit:
8b00914654ef56ff5473f4fe1f1168254dbb8a17
Reviewed by: kib
Sponsored by: Mellanox Technologies // NVIDIA Networking
(cherry picked from commit 2f05418748585dcbd5912f335040f652a8cc9703)
Diffstat (limited to 'sys/ofed')
| -rw-r--r-- | sys/ofed/drivers/infiniband/core/ib_cm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/ofed/drivers/infiniband/core/ib_cm.c b/sys/ofed/drivers/infiniband/core/ib_cm.c index 1f96a733b042..7dea2620cb60 100644 --- a/sys/ofed/drivers/infiniband/core/ib_cm.c +++ b/sys/ofed/drivers/infiniband/core/ib_cm.c @@ -1790,8 +1790,7 @@ static int cm_req_handler(struct cm_work *work) listen_cm_id_priv = cm_match_req(work, cm_id_priv); if (!listen_cm_id_priv) { ret = -EINVAL; - kfree(cm_id_priv->timewait_info); - goto destroy; + goto free_timeinfo; } cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler; @@ -1866,6 +1865,8 @@ static int cm_req_handler(struct cm_work *work) rejected: atomic_dec(&cm_id_priv->refcount); cm_deref_id(listen_cm_id_priv); +free_timeinfo: + kfree(cm_id_priv->timewait_info); destroy: ib_destroy_cm_id(cm_id); return ret; |