Skip to content

Commit

Permalink
libceph: avoid NULL kref_put when osd reset races with alloc_msg
Browse files Browse the repository at this point in the history
The ceph_on_in_msg_alloc() method drops con->mutex while it allocates a
message.  If that races with a timeout that resends a zillion messages and
resets the connection, and the ->alloc_msg() method returns a NULL message,
it will call ceph_msg_put(NULL) and BUG.

Fix by only calling put if msg is non-NULL.

Fixes http://tracker.newdream.net/issues/3142

Signed-off-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Sage Weil committed Oct 24, 2012
1 parent 588377d commit 9bd9526
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -2750,7 +2750,8 @@ static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)
msg = con->ops->alloc_msg(con, hdr, skip);
mutex_lock(&con->mutex);
if (con->state != CON_STATE_OPEN) {
ceph_msg_put(msg);
if (msg)
ceph_msg_put(msg);
return -EAGAIN;
}
con->in_msg = msg;
Expand Down

0 comments on commit 9bd9526

Please sign in to comment.