diff options
| author | Sage Weil <sage@redhat.com> | 2014-08-04 07:01:54 -0700 |
|---|---|---|
| committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-09-10 20:08:32 +0400 |
| commit | 73c3d4812b4c755efeca0140f606f83772a39ce4 (patch) | |
| tree | a48b5e28464f191b764d4b3930e6919a2cf8b405 /net/ceph | |
| parent | 255939e783d8f45f8c58487dfc18957c44ea9871 (diff) | |
| download | linux-stable-73c3d4812b4c755efeca0140f606f83772a39ce4.tar.gz linux-stable-73c3d4812b4c755efeca0140f606f83772a39ce4.tar.bz2 linux-stable-73c3d4812b4c755efeca0140f606f83772a39ce4.zip | |
libceph: gracefully handle large reply messages from the mon
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.
CC: stable@vger.kernel.org
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Diffstat (limited to 'net/ceph')
| -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 067d3af2eaf6..61fcfc304f68 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -1181,7 +1181,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; } |