Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 3e8f43a0 authored Sep 20, 2012 by Yan, Zheng Committed by Alex Elder Oct 01, 2012

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 <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>

parent 6e14b1a6

fs/ceph/mds_client.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) {