aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorArtemy Kovalyov <artemyko@mellanox.com>2018-08-28 14:40:32 +0300
committerJason Gunthorpe <jgg@mellanox.com>2018-09-04 15:07:55 -0600
commite4ff3d22c11dd505353896cdcad0ee8f3251be68 (patch)
treea17ff2322f9ea626aaf531d153fa331fc04b8f24 /drivers/infiniband
parentRDMA/ucma: check fd type in ucma_migrate_id() (diff)
downloadlinux-dev-e4ff3d22c11dd505353896cdcad0ee8f3251be68.tar.xz
linux-dev-e4ff3d22c11dd505353896cdcad0ee8f3251be68.zip
IB/core: Release object lock if destroy failed
The object lock was supposed to always be released during destroy, but when the destruction retry series was integrated with the destroy series it created a failure path that missed the unlock. Keep with convention, if destroy fails the caller must undo all locking. Fixes: 87ad80abc70d ("IB/uverbs: Consolidate uobject destruction") Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/core/rdma_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/core/rdma_core.c b/drivers/infiniband/core/rdma_core.c
index 6eb64c6f0802..c4118bcd5103 100644
--- a/drivers/infiniband/core/rdma_core.c
+++ b/drivers/infiniband/core/rdma_core.c
@@ -882,6 +882,8 @@ static int __uverbs_cleanup_ufile(struct ib_uverbs_file *ufile,
WARN_ON(uverbs_try_lock_object(obj, UVERBS_LOOKUP_WRITE));
if (!uverbs_destroy_uobject(obj, reason))
ret = 0;
+ else
+ atomic_set(&obj->usecnt, 0);
}
return ret;
}