diff options
author | Sage Weil <sage@redhat.com> | 2014-08-04 07:01:54 -0700 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-11-05 20:27:42 +0000 |
commit | df0fddbf7ec235d49847efcda0d3c901d7964ba5 (patch) | |
tree | 82b8be3c59a7382d4ad3982dc31a390960455968 /net | |
parent | 488dbde366f437720b55cd29571219cebc89251b (diff) |
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 <sage@redhat.com>
Reviewed-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/mon_client.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 456f6a33b8ab..0c0859b3df3e 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -987,7 +987,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; } |