| Message ID | 1395944299-21970-13-git-send-email-ilya.dryomov@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/27/2014 01:17 PM, Ilya Dryomov wrote: > Sum up sizeof(...) results instead of (incorrectly) hard-coding the > number of bytes, expressed in ints and longs. Yay!!! Looks good. Reviewed-by: Alex Elder <elder@linaro.org> > Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> > --- > net/ceph/osdmap.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c > index 75e192e99173..6dd083906a1e 100644 > --- a/net/ceph/osdmap.c > +++ b/net/ceph/osdmap.c > @@ -706,7 +706,9 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) > goto e_inval; > } > > - ceph_decode_need(p, end, 2*sizeof(u64)+6*sizeof(u32), e_inval); > + /* fsid, epoch, created, modified */ > + ceph_decode_need(p, end, sizeof(map->fsid) + sizeof(u32) + > + sizeof(map->created) + sizeof(map->modified), e_inval); > ceph_decode_copy(p, &map->fsid, sizeof(map->fsid)); > epoch = map->epoch = ceph_decode_32(p); > ceph_decode_copy(p, &map->created, sizeof(map->created)); > @@ -872,8 +874,9 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, > goto e_inval; > } > > - ceph_decode_need(p, end, sizeof(fsid)+sizeof(modified)+2*sizeof(u32), > - e_inval); > + /* fsid, epoch, modified, new_pool_max, new_flags */ > + ceph_decode_need(p, end, sizeof(fsid) + sizeof(u32) + sizeof(modified) + > + sizeof(u64) + sizeof(u32), e_inval); > ceph_decode_copy(p, &fsid, sizeof(fsid)); > epoch = ceph_decode_32(p); > BUG_ON(epoch != map->epoch+1); > @@ -907,10 +910,8 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, > if (new_pool_max >= 0) > map->pool_max = new_pool_max; > > - ceph_decode_need(p, end, 5*sizeof(u32), e_inval); > - > /* new max? */ > - max = ceph_decode_32(p); > + ceph_decode_32_safe(p, end, max, e_inval); > if (max >= 0) { > err = osdmap_set_max_osd(map, max); > if (err) > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 75e192e99173..6dd083906a1e 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -706,7 +706,9 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) goto e_inval; } - ceph_decode_need(p, end, 2*sizeof(u64)+6*sizeof(u32), e_inval); + /* fsid, epoch, created, modified */ + ceph_decode_need(p, end, sizeof(map->fsid) + sizeof(u32) + + sizeof(map->created) + sizeof(map->modified), e_inval); ceph_decode_copy(p, &map->fsid, sizeof(map->fsid)); epoch = map->epoch = ceph_decode_32(p); ceph_decode_copy(p, &map->created, sizeof(map->created)); @@ -872,8 +874,9 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, goto e_inval; } - ceph_decode_need(p, end, sizeof(fsid)+sizeof(modified)+2*sizeof(u32), - e_inval); + /* fsid, epoch, modified, new_pool_max, new_flags */ + ceph_decode_need(p, end, sizeof(fsid) + sizeof(u32) + sizeof(modified) + + sizeof(u64) + sizeof(u32), e_inval); ceph_decode_copy(p, &fsid, sizeof(fsid)); epoch = ceph_decode_32(p); BUG_ON(epoch != map->epoch+1); @@ -907,10 +910,8 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, if (new_pool_max >= 0) map->pool_max = new_pool_max; - ceph_decode_need(p, end, 5*sizeof(u32), e_inval); - /* new max? */ - max = ceph_decode_32(p); + ceph_decode_32_safe(p, end, max, e_inval); if (max >= 0) { err = osdmap_set_max_osd(map, max); if (err)
Sum up sizeof(...) results instead of (incorrectly) hard-coding the number of bytes, expressed in ints and longs. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> --- net/ceph/osdmap.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)