diff mbox series

RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()

Message ID 20200221152023.GA8680@ziepe.ca (mailing list archive)
State Mainlined
Commit c14dfddbd869bf0c2bafb7ef260c41d9cebbcfec
Delegated to: Jason Gunthorpe
Headers show
Series RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen() | expand

Commit Message

Jason Gunthorpe Feb. 21, 2020, 3:20 p.m. UTC
The algorithm pre-allocates a cm_id since allocation cannot be done while
holding the cm.lock spinlock, however it doesn't free it on one error
path, leading to a memory leak.

Fixes: 067b171b8679 ("IB/cm: Share listening CM IDs")
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---
 drivers/infiniband/core/cm.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Jason Gunthorpe Feb. 27, 2020, 8:45 p.m. UTC | #1
On Fri, Feb 21, 2020 at 03:20:26PM +0000, Jason Gunthorpe wrote:
> The algorithm pre-allocates a cm_id since allocation cannot be done while
> holding the cm.lock spinlock, however it doesn't free it on one error
> path, leading to a memory leak.
> 
> Fixes: 067b171b8679 ("IB/cm: Share listening CM IDs")
> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
> ---
>  drivers/infiniband/core/cm.c | 1 +
>  1 file changed, 1 insertion(+)

Applied to for-rc

Jason
diff mbox series

Patch

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index bfe97bae91ce0d..c8fe74f6394faa 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1191,6 +1191,7 @@  struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,
 			/* Sharing an ib_cm_id with different handlers is not
 			 * supported */
 			spin_unlock_irqrestore(&cm.lock, flags);
+			ib_destroy_cm_id(cm_id);
 			return ERR_PTR(-EINVAL);
 		}
 		refcount_inc(&cm_id_priv->refcount);