]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
IB/uverbs: Fix leak of XRC target QPs
authorTariq Toukan <tariqt@mellanox.com>
Thu, 27 Oct 2016 13:36:26 +0000 (16:36 +0300)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 29 May 2017 00:46:50 +0000 (17:46 -0700)
The real QP is destroyed in case of the ref count reaches zero, but
for XRC target QPs this call was missed and caused to QP leaks.

Let's call to destroy for all flows.

Orabug: 24761732

Fixes: 0e0ec7e0638e ('RDMA/core: Export ib_open_qp() to share XRC...')
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Noa Osherovich <noaos@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
(cherry picked from commit 5b810a242c28e1d8d64d718cebe75b79d86a0b2d)
Signed-off-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
drivers/infiniband/core/uverbs_main.c

index 32e587052a91424ca5f21783a4c9f69ae6555ef4..91400c90fe5ad3ea667771b06270120af5615798 100644 (file)
@@ -277,12 +277,9 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file,
                        container_of(uobj, struct ib_uqp_object, uevent.uobject);
 
                idr_remove_uobj(&ib_uverbs_qp_idr, uobj);
-               if (qp != qp->real_qp) {
-                       ib_close_qp(qp);
-               } else {
+               if (qp == qp->real_qp)
                        ib_uverbs_detach_umcast(qp, uqp);
-                       ib_destroy_qp(qp);
-               }
+               ib_destroy_qp(qp);
                ib_uverbs_release_uevent(file, &uqp->uevent);
                kfree(uqp);
        }