evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libceph: safely decode max_osd value in osdmap_decode()

Browse source 
max_osd value is not covered by any ceph_decode_need().  Use a safe
version of ceph_decode_* macro to decode it.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Ilya Dryomov 2014-03-13 16:36:14 +02:00 • committed by Sage Weil
parent 597b52f6ca
commit 3977058c46
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/ceph/osdmap.c
View file

@ -687,9 +687,10 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)
{ {
u16 version; u16 version;
u32 len, max, i;
u32 epoch = 0; u32 epoch = 0;
void *start = *p; void *start = *p;
u32 max;
u32 len, i;
int err; int err;
struct ceph_pg_pool_info *pi; struct ceph_pg_pool_info *pi;
@ -736,7 +737,8 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)
ceph_decode_32_safe(p, end, map->flags, e_inval); ceph_decode_32_safe(p, end, map->flags, e_inval);
max = ceph_decode_32(p); /* max_osd */
ceph_decode_32_safe(p, end, max, e_inval);
/* (re)alloc osd arrays */ /* (re)alloc osd arrays */
err = osdmap_set_max_osd(map, max); err = osdmap_set_max_osd(map, max);