diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-15 01:52:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 15:24:25 -0500 |
commit | 53341d7de3f013cc39a3692bdfd02032ce722dff (patch) | |
tree | 49ec693d9f8d8dab9a6751e9f22b7fa300180b84 | |
parent | e9e4b13abe4e4a399ed115b858ba8471854a938b (diff) |
libceph: potential NULL dereference in ceph_osdc_handle_map()
commit b72e19b9225d4297a18715b0998093d843d170fa upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/ceph/osd_client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 65d8c3b7df97..311161eac5c4 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -1786,6 +1786,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) | |||
1786 | nr_maps--; | 1786 | nr_maps--; |
1787 | } | 1787 | } |
1788 | 1788 | ||
1789 | if (!osdc->osdmap) | ||
1790 | goto bad; | ||
1789 | done: | 1791 | done: |
1790 | downgrade_write(&osdc->map_sem); | 1792 | downgrade_write(&osdc->map_sem); |
1791 | ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch); | 1793 | ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch); |