From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 15 Aug 2013 05:52:48 +0000 (+0300)
Subject: libceph: potential NULL dereference in ceph_osdc_handle_map()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b72e19b9225d4297a18715b0998093d843d170fa;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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)
 		nr_maps--;
 	}
 
+	if (!osdc->osdmap)
+		goto bad;
 done:
 	downgrade_write(&osdc->map_sem);
 	ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch);