From: Sage Weil Date: Mon, 4 Aug 2014 14:01:54 +0000 (-0700) Subject: libceph: gracefully handle large reply messages from the mon X-Git-Tag: submit/tizen_common/20140918.111125~48 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6e22ca59611f6df36c00b359e639d77004a2278;p=profile%2Fivi%2Fkernel-x86-ivi.git libceph: gracefully handle large reply messages from the mon commit 73c3d4812b4c755efeca0140f606f83772a39ce4 upstream. We preallocate a few of the message types we get back from the mon. If we get a larger message than we are expecting, fall back to trying to allocate a new one instead of blindly using the one we have. Signed-off-by: Sage Weil Reviewed-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 2ac9ef3..dbcbf5a 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -1041,7 +1041,15 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con, if (!m) { pr_info("alloc_msg unknown type %d\n", type); *skip = 1; + } else if (front_len > m->front_alloc_len) { + pr_warning("mon_alloc_msg front %d > prealloc %d (%u#%llu)\n", + front_len, m->front_alloc_len, + (unsigned int)con->peer_name.type, + le64_to_cpu(con->peer_name.num)); + ceph_msg_put(m); + m = ceph_msg_new(type, front_len, GFP_NOFS, false); } + return m; }