summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-10-24 16:12:58 -0700
committerSage Weil <sage@inktank.com>2012-10-24 16:19:19 -0700
commit9bd952615a42d7e2ce3fa2c632e808e804637a1a (patch)
tree7eb86ac8c5f00f160cf5dc23d1a5d89ab951fcd5 /net/ceph
parent588377d6199034c36d335e7df5818b731fea072c (diff)
downloadop-kernel-dev-9bd952615a42d7e2ce3fa2c632e808e804637a1a.zip
op-kernel-dev-9bd952615a42d7e2ce3fa2c632e808e804637a1a.tar.gz
libceph: avoid NULL kref_put when osd reset races with alloc_msg
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>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/messenger.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index cad0d17..3ef1759 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -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;
OpenPOWER on IntegriCloud