libceph: check length of osdmap osd arrays
Check length of osd_state, osd_weight and osd_addr arrays. They should all have exactly max_osd elements after the call to osdmap_set_max_osd(). Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Родитель
3977058c46
Коммит
2d88b2e081
|
@ -745,19 +745,25 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)
|
|||
if (err)
|
||||
goto bad;
|
||||
|
||||
/* osds */
|
||||
/* osd_state, osd_weight, osd_addrs->client_addr */
|
||||
ceph_decode_need(p, end, 3*sizeof(u32) +
|
||||
map->max_osd*(1 + sizeof(*map->osd_weight) +
|
||||
sizeof(*map->osd_addr)), e_inval);
|
||||
|
||||
*p += 4; /* skip length field (should match max) */
|
||||
if (ceph_decode_32(p) != map->max_osd)
|
||||
goto e_inval;
|
||||
|
||||
ceph_decode_copy(p, map->osd_state, map->max_osd);
|
||||
|
||||
*p += 4; /* skip length field (should match max) */
|
||||
if (ceph_decode_32(p) != map->max_osd)
|
||||
goto e_inval;
|
||||
|
||||
for (i = 0; i < map->max_osd; i++)
|
||||
map->osd_weight[i] = ceph_decode_32(p);
|
||||
|
||||
*p += 4; /* skip length field (should match max) */
|
||||
if (ceph_decode_32(p) != map->max_osd)
|
||||
goto e_inval;
|
||||
|
||||
ceph_decode_copy(p, map->osd_addr, map->max_osd*sizeof(*map->osd_addr));
|
||||
for (i = 0; i < map->max_osd; i++)
|
||||
ceph_decode_addr(&map->osd_addr[i]);
|
||||
|
|
Загрузка…
Ссылка в новой задаче