From c3e794b3cfd2706ba87df1682ce255b19761e694 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Sep 2014 09:34:00 -0700 Subject: [PATCH] 3.14-stable patches added patches: libceph-gracefully-handle-large-reply-messages-from-the-mon.patch --- ...le-large-reply-messages-from-the-mon.patch | 39 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-3.14/libceph-gracefully-handle-large-reply-messages-from-the-mon.patch diff --git a/queue-3.14/libceph-gracefully-handle-large-reply-messages-from-the-mon.patch b/queue-3.14/libceph-gracefully-handle-large-reply-messages-from-the-mon.patch new file mode 100644 index 00000000000..308518b764c --- /dev/null +++ b/queue-3.14/libceph-gracefully-handle-large-reply-messages-from-the-mon.patch @@ -0,0 +1,39 @@ +From 73c3d4812b4c755efeca0140f606f83772a39ce4 Mon Sep 17 00:00:00 2001 +From: Sage Weil +Date: Mon, 4 Aug 2014 07:01:54 -0700 +Subject: libceph: gracefully handle large reply messages from the mon + +From: Sage Weil + +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 + +--- + net/ceph/mon_client.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/net/ceph/mon_client.c ++++ b/net/ceph/mon_client.c +@@ -1041,7 +1041,15 @@ static struct ceph_msg *mon_alloc_msg(st + 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; + } + diff --git a/queue-3.14/series b/queue-3.14/series index 950a5be8893..0a29e2037f7 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -109,3 +109,4 @@ blkcg-don-t-call-into-policy-draining-if-root_blkg-is-already-gone.patch ib-srp-fix-deadlock-between-host-removal-and-multipathd.patch drm-nouveau-bump-version-from-1.1.1-to-1.1.2.patch vfs-fix-bad-hashing-of-dentries.patch +libceph-gracefully-handle-large-reply-messages-from-the-mon.patch -- 2.47.3