lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: Fix oops when handling mdsmap that decreases max_mds

Browse Source 
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>
This commit is contained in:
Yan, Zheng
2012-09-20 17:42:25 +08:00
committed by Alex Elder
parent 6e14b1a6c3
commit 3e8f43a089
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ceph/mds_client.c
View File

@@ -2625,7 +2625,8 @@ static void check_new_map(struct ceph_mds_client *mdsc,
ceph_mdsmap_is_laggy(newmap, i) ? " (laggy)" : "", ceph_mdsmap_is_laggy(newmap, i) ? " (laggy)" : "",
session_state_name(s->s_state)); 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), ceph_mdsmap_get_addr(newmap, i),
sizeof(struct ceph_entity_addr))) { sizeof(struct ceph_entity_addr))) {
if (s->s_state == CEPH_MDS_SESSION_OPENING) { if (s->s_state == CEPH_MDS_SESSION_OPENING) {