projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1874119
)
libceph: potential NULL dereference in ceph_osdc_handle_map()
author
Dan Carpenter
<dan.carpenter@oracle.com>
Thu, 15 Aug 2013 05:52:48 +0000
(08:52 +0300)
committer
Sage Weil
<sage@inktank.com>
Tue, 27 Aug 2013 19:26:30 +0000
(12:26 -0700)
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>
net/ceph/osd_client.c
patch
|
blob
|
history
diff --git
a/net/ceph/osd_client.c
b/net/ceph/osd_client.c
index 3ee4a1da02cd0a8b5812635c45f511d51bae7727..6a59fb8fc999a3660ce9add800dcec8c6b7e345d 100644
(file)
--- 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);