From: "Yan, Zheng" <[email protected]> When i >= newmap->m_max_mds, ceph_mdsmap_get_addr(newmap, i) return NULL. Passing NULL to memcmp() triggers oops.
[Upstream commit 3e8f43a089f06279c5f76a9ccd42578eebf7bfa5] CC: [email protected] Signed-off-by: Yan, Zheng <[email protected]> Signed-off-by: Sage Weil <[email protected]> --- fs/ceph/mds_client.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index a5a7354..1bcf712 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2625,7 +2625,8 @@ static void check_new_map(struct ceph_mds_client *mdsc, ceph_mdsmap_is_laggy(newmap, i) ? " (laggy)" : "", session_state_name(s->s_state)); - if (memcmp(ceph_mdsmap_get_addr(oldmap, i), + if (i >= newmap->m_max_mds || + memcmp(ceph_mdsmap_get_addr(oldmap, i), ceph_mdsmap_get_addr(newmap, i), sizeof(struct ceph_entity_addr))) { if (s->s_state == CEPH_MDS_SESSION_OPENING) { -- 1.7.9 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
