1 files changed, 3 insertions, 0 deletions

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index ab6b24a5169e..8462ccec6333 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -442,6 +442,7 @@ static struct ceph_msg *get_generic_reply(struct ceph_connection *con,
                 m = NULL;
         } else {
                 dout("get_generic_reply %lld got %p\n", tid, req->reply);
+                *skip = 0;
                 m = ceph_msg_get(req->reply);
                 /*
                  * we don't need to track the connection reading into
@@ -982,6 +983,8 @@ static struct ceph_msg *mon_alloc_msg(struct ceph_connection *con,
         case CEPH_MSG_MDS_MAP:
         case CEPH_MSG_OSD_MAP:
                 m = ceph_msg_new(type, front_len, GFP_NOFS, false);
+                if (!m)
+                        return NULL;    /* ENOMEM--return skip == 0 */
                 break;
         }