From: Eldad Zinger <eldadz@mellanox.co.il>
Date: Tue, 3 Aug 2010 16:14:59 +0000 (+0300)
Subject: sdp: BUG1403 - last sk_refcnt is called while cma handler is invoked
X-Git-Tag: v4.1.12-92~264^2~5^2~123
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=93d86aa909a6e3b63bd7244c14a6ef05209b2706;p=users%2Fjedix%2Flinux-maple.git

sdp: BUG1403 - last sk_refcnt is called while cma handler is invoked

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>
---

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 43820615afdee..7054d10198ea9 100644
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -506,6 +506,21 @@ static void sdp_destroy_resources(struct sock *sk)
 
 }
 
+static inline void sdp_kill_id_and_release(struct sdp_sock *ssk)
+{
+	struct sock *sk = &ssk->isk.sk;
+	struct rdma_cm_id *id;
+
+	lock_sock(sk);
+	id = ssk->id;
+	ssk->id = NULL;
+	release_sock(sk);
+
+	if (id)
+		rdma_destroy_id(id);
+	sdp_common_release(sk);
+}
+
 static void sdp_destruct(struct sock *sk)
 {
 	struct sdp_sock *ssk = sdp_sk(sk);
@@ -535,10 +550,10 @@ static void sdp_destruct(struct sock *sk)
 		goto done;
 
 	list_for_each_entry_safe(s, t, &ssk->backlog_queue, backlog_queue) {
-		sdp_common_release(&s->isk.sk);
+		sdp_kill_id_and_release(s);
 	}
 	list_for_each_entry_safe(s, t, &ssk->accept_queue, accept_queue) {
-		sdp_common_release(&s->isk.sk);
+		sdp_kill_id_and_release(s);
 	}
 
 done:
@@ -806,10 +821,10 @@ static int sdp_disconnect(struct sock *sk, int flags)
 		rdma_destroy_id(id);
 
 	list_for_each_entry_safe(s, t, &ssk->backlog_queue, backlog_queue) {
-		sdp_common_release(&s->isk.sk);
+		sdp_kill_id_and_release(s);
 	}
 	list_for_each_entry_safe(s, t, &ssk->accept_queue, accept_queue) {
-		sdp_common_release(&s->isk.sk);
+		sdp_kill_id_and_release(s);
 	}
 
 	lock_sock(sk);