1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 01d70084aebe..495c803fb11d 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -147,8 +147,12 @@ static struct ib_uobject *__idr_get_uobj(struct idr *idr, int id,
 
         spin_lock(&ib_uverbs_idr_lock);
         uobj = idr_find(idr, id);
-        if (uobj)
-                kref_get(&uobj->ref);
+        if (uobj) {
+                if (uobj->context == context)
+                        kref_get(&uobj->ref);
+                else
+                        uobj = NULL;
+        }
         spin_unlock(&ib_uverbs_idr_lock);
 
         return uobj;