Skip to contentSkip to conversation

ivtv: sizeof() => ARRAY_SIZE()

PATCH In review Dan Carpenter 2 participants 2 messages Mar 17, 2010 – Mar 18, 2010

Subsystems (2)
Media (V4L/DVB) Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ivtv: sizeof() => ARRAY_SIZE()

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 <[email protected]>
drivers/media/video/ivtv/ivtv-vbi.c +1 -1
index f420d31..d73af45 100644
@@ -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);
 	}
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

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 <[email protected]>

Looks good.

Reviewed-by Andy Walls <[email protected]>

And, if needed

Signed-off-by Andy Walls <[email protected]>

Regards,
Andy

Quoted 14 lines
drivers/media/video/ivtv/ivtv-vbi.c +1 -1
index f420d31..d73af45 100644
@@ -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);
 	}