Quoting Oren Laadan ([email protected]): > As noted by Matt Helsley, a portion of one of these functions was > missing the block "dispatching" errors. Otherwise the handling of > shard objects is pretty much the same, so this patch factors out the > common code. > > Cc: Matt Helsley <[email protected]> > Signed-off-by: Oren Laadan <[email protected]>
Acked-by: Serge Hallyn <[email protected]> Although you could go one step further and pass in len and max and check those in ckpt_read_obj_dispatch() as well. -serge > --- > checkpoint/restart.c | 58 ++++++++++++++++++++++++++----------------------- > 1 files changed, 31 insertions(+), 27 deletions(-) > > diff --git a/checkpoint/restart.c b/checkpoint/restart.c > index 9b75de8..130b4b2 100644 > --- a/checkpoint/restart.c > +++ b/checkpoint/restart.c > @@ -238,6 +238,35 @@ static int _ckpt_read_objref(struct ckpt_ctx *ctx, > struct ckpt_hdr *hh) > return ret; > } > > +/** > + * ckpt_read_obj_dispatch - dispatch ERRORs and OBJREFs; don't return them > + * @ctx: checkpoint context > + * @h: desired ckpt_hdr > + */ > +static int ckpt_read_obj_dispatch(struct ckpt_ctx *ctx, struct ckpt_hdr *h) > +{ > + int ret; > + > + while (1) { > + ret = ckpt_kread(ctx, h, sizeof(*h)); > + if (ret < 0) > + return ret; > + _ckpt_debug(CKPT_DRW, "type %d len %d\n", h->type, h->len); > + if (h->len < sizeof(*h)) > + return -EINVAL; > + > + if (h->type == CKPT_HDR_ERROR) { > + ret = _ckpt_read_err(ctx, h); > + if (ret < 0) > + return ret; > + } else if (h->type == CKPT_HDR_OBJREF) { > + ret = _ckpt_read_objref(ctx, h); > + if (ret < 0) > + return ret; > + } else > + return 0; > + } > +} > > /** > * _ckpt_read_obj - read an object (ckpt_hdr followed by payload) > @@ -254,26 +283,11 @@ static int _ckpt_read_obj(struct ckpt_ctx *ctx, struct > ckpt_hdr *h, > { > int ret; > > - again: > - ret = ckpt_kread(ctx, h, sizeof(*h)); > + ret = ckpt_read_obj_dispatch(ctx, h); > if (ret < 0) > return ret; > _ckpt_debug(CKPT_DRW, "type %d len %d(%d,%d)\n", > h->type, h->len, len, max); > - if (h->len < sizeof(*h)) > - return -EINVAL; > - > - if (h->type == CKPT_HDR_ERROR) { > - ret = _ckpt_read_err(ctx, h); > - if (ret < 0) > - return ret; > - goto again; > - } else if (h->type == CKPT_HDR_OBJREF) { > - ret = _ckpt_read_objref(ctx, h); > - if (ret < 0) > - return ret; > - goto again; > - } > > /* if len specified, enforce, else if maximum specified, enforce */ > if ((len && h->len != len) || (!len && max && h->len > max)) > @@ -362,21 +376,11 @@ static void *ckpt_read_obj(struct ckpt_ctx *ctx, int > len, int max) > struct ckpt_hdr *h; > int ret; > > - again: > - ret = ckpt_kread(ctx, &hh, sizeof(hh)); > + ret = ckpt_read_obj_dispatch(ctx, &hh); > if (ret < 0) > return ERR_PTR(ret); > _ckpt_debug(CKPT_DRW, "type %d len %d(%d,%d)\n", > hh.type, hh.len, len, max); > - if (hh.len < sizeof(*h)) > - return ERR_PTR(-EINVAL); > - > - if (hh.type == CKPT_HDR_OBJREF) { > - ret = _ckpt_read_objref(ctx, &hh); > - if (ret < 0) > - return ERR_PTR(ret); > - goto again; > - } > > /* if len specified, enforce, else if maximum specified, enforce */ > if ((len && hh.len != len) || (!len && max && hh.len > max)) > -- > 1.6.0.4 > > _______________________________________________ > Containers mailing list > [email protected] > https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Containers mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Devel mailing list [email protected] https://openvz.org/mailman/listinfo/devel
