diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-30 18:16:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:42 -0800 |
| commit | 900fbd910f53a417a6b0859bd2cde7ae48ac4bb2 (patch) | |
| tree | eed8fb8ac93d796b0e8b58c96be9d2fcac65d8ea /net | |
| parent | da75ae3c0d4c40587fa7583952b98072d811a7d2 (diff) | |
| download | linux-3.10-900fbd910f53a417a6b0859bd2cde7ae48ac4bb2.tar.gz linux-3.10-900fbd910f53a417a6b0859bd2cde7ae48ac4bb2.tar.bz2 linux-3.10-900fbd910f53a417a6b0859bd2cde7ae48ac4bb2.zip | |
libceph: verify state after retaking con lock after dispatch
(cherry picked from commit 7b862e07b1a4d5c963d19027f10ea78085f27f9b)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 8edc0c14f1c..bb21e5b0fb5 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) { |