Re: [patch] ivtv: sizeof() => ARRAY_SIZE()

From: Andy Walls
Date: Thu Mar 18 2010 - 07:37:25 EST


On Wed, 2010-03-17 at 18:11 +0300, Dan Carpenter wrote:
> This fixes a smatch warning:
> drivers/media/video/ivtv/ivtv-vbi.c +138 ivtv_write_vbi(43)
> error: buffer overflow 'vi->cc_payload' 256 <= 1023
>
> Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>

Looks good.

Reviewed-by: Andy Walls <awalls@xxxxxxxxx>

And, if needed

Signed-off-by: Andy Walls <awalls@xxxxxxxxx>

Regards,
Andy

> diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
> index f420d31..d73af45 100644
> --- a/drivers/media/video/ivtv/ivtv-vbi.c
> +++ b/drivers/media/video/ivtv/ivtv-vbi.c
> @@ -134,7 +134,7 @@ void ivtv_write_vbi(struct ivtv *itv, const struct v4l2_sliced_vbi_data *sliced,
> }
> }
> }
> - if (found_cc && vi->cc_payload_idx < sizeof(vi->cc_payload)) {
> + if (found_cc && vi->cc_payload_idx < ARRAY_SIZE(vi->cc_payload)) {
> vi->cc_payload[vi->cc_payload_idx++] = cc;
> set_bit(IVTV_F_I_UPDATE_CC, &itv->i_flags);
> }
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/