aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-15 01:52:48 -0400
committerSage Weil <sage@inktank.com>2013-08-27 15:26:30 -0400
commitb72e19b9225d4297a18715b0998093d843d170fa (patch)
tree650d3bc5701027cfc118f0c81a1dae5f016c88bc /net/ceph
parent1874119664dafda3ef2ed9b51b4759a9540d4a1a (diff)
libceph: potential NULL dereference in ceph_osdc_handle_map()
There are two places where we read "nr_maps" if both of them are set to zero then we would hit a NULL dereference here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/osd_client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 3ee4a1da02cd..6a59fb8fc999 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1793,6 +1793,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
1793 nr_maps--; 1793 nr_maps--;
1794 } 1794 }
1795 1795
1796 if (!osdc->osdmap)
1797 goto bad;
1796done: 1798done:
1797 downgrade_write(&osdc->map_sem); 1799 downgrade_write(&osdc->map_sem);
1798 ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch); 1800 ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch);