diff options
author | Nathaniel Yazdani <n1ght.4nd.d4y@gmail.com> | 2013-08-05 00:04:30 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-09 20:52:58 -0400 |
commit | c338c07c51e3106711fad5eb599e375eadb6855d (patch) | |
tree | 8045873c76f120c3beca96a6db7d8fa316cf3eb2 /fs/ceph | |
parent | 73d9f7eef3d98c3920e144797cc1894c6b005a1e (diff) |
ceph: fix null pointer dereference
When register_session() is given an out-of-range argument for mds,
ceph_mdsmap_get_addr() will return a null pointer, which would be given to
ceph_con_open() & be dereferenced, causing a kernel oops. This fixes bug #4685
in the Ceph bug tracker <http://tracker.ceph.com/issues/4685>.
Signed-off-by: Nathaniel Yazdani <n1ght.4nd.d4y@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph')
-rw-r--r-- | fs/ceph/mds_client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 3eb1b4470c85..6b40d8112c64 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -414,6 +414,9 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, | |||
414 | { | 414 | { |
415 | struct ceph_mds_session *s; | 415 | struct ceph_mds_session *s; |
416 | 416 | ||
417 | if (mds >= mdsc->mdsmap->m_max_mds) | ||
418 | return ERR_PTR(-EINVAL); | ||
419 | |||
417 | s = kzalloc(sizeof(*s), GFP_NOFS); | 420 | s = kzalloc(sizeof(*s), GFP_NOFS); |
418 | if (!s) | 421 | if (!s) |
419 | return ERR_PTR(-ENOMEM); | 422 | return ERR_PTR(-ENOMEM); |