From: Yan, Zheng Date: Thu, 20 Sep 2012 09:42:25 +0000 (+0800) Subject: ceph: Fix oops when handling mdsmap that decreases max_mds X-Git-Tag: v3.12-rc1~1650^2~79 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e8f43a089f06279c5f76a9ccd42578eebf7bfa5;p=kernel%2Fkernel-generic.git ceph: Fix oops when handling mdsmap that decreases max_mds When i >= newmap->m_max_mds, ceph_mdsmap_get_addr(newmap, i) return NULL. Passing NULL to memcmp() triggers oops. Signed-off-by: Yan, Zheng Signed-off-by: Sage Weil --- 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) {