From: Sage Weil <sage@inktank.com>
Date: Tue, 31 Jul 2012 01:16:56 +0000 (-0700)
Subject: libceph: verify state after retaking con lock after dispatch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7b862e07b1a4d5c963d19027f10ea78085f27f9b;p=openwrt%2Fstaging%2Fblogic.git

libceph: verify state after retaking con lock after dispatch

We drop the con mutex when delivering a message.  When we retake the
lock, we need to verify we are still in the OPEN state before
preparing to read the next tag, or else we risk stepping on a
connection that has been closed.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
---

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index a6a0c7a0a979..feb5a2ac724c 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2003,7 +2003,6 @@ static void process_message(struct ceph_connection *con)
 	con->ops->dispatch(con, msg);
 
 	mutex_lock(&con->mutex);
-	prepare_read_tag(con);
 }
 
 
@@ -2213,6 +2212,8 @@ more:
 		if (con->in_tag == CEPH_MSGR_TAG_READY)
 			goto more;
 		process_message(con);
+		if (con->state == CON_STATE_OPEN)
+			prepare_read_tag(con);
 		goto more;
 	}
 	if (con->in_tag == CEPH_MSGR_TAG_ACK) {