From 83c3ebfd473cc42ca0037ab2fd029e55ecef772d Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Fri, 19 Oct 2007 20:01:43 -0700
Subject: [PATCH] --- yaml --- r: 72291 b: refs/heads/master c:
 cbfb50e6e2e9c580848c0f51d37c24cdfb1cb704 h: refs/heads/master i:   72289:
 a449e70a597ddbc063103c2b22d1b514cd6d5db3   72287:
 3acc838300f7b90784b9e456fd05cfdc25bffb53 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/infiniband/core/uverbs_cmd.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5d326007e124..1d62d0dca5e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 839041329fd3410e07d614f81e75bb43367d8f89
+refs/heads/master: cbfb50e6e2e9c580848c0f51d37c24cdfb1cb704
diff --git a/trunk/drivers/infiniband/core/uverbs_cmd.c b/trunk/drivers/infiniband/core/uverbs_cmd.c
index 01d70084aebe..495c803fb11d 100644
--- a/trunk/drivers/infiniband/core/uverbs_cmd.c
+++ b/trunk/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;