video/hdmi: handle short reads of hdmi info frame.
Subsystems (4)
PATCH 1/1 video/hdmi: handle short reads of hdmi info frame.
From: Tom Rix <[email protected]>
Calling hdmi_infoframe_unpack() with static sizeof(buffer) skips all the size checking done later in hdmi_infoframe_unpack(). A better value is the amount of data read into buffer.
Fixes 480b8b3e42c3 ("video/hdmi: Pass buffer size to infoframe unpack functions")
Signed-off-by Tom Rix <[email protected]>
--- drivers/media/i2c/adv7511-v4l2.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/i2c/adv7511-v4l2.c +1 -1
@@ -544,7 +544,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7511_cfg_read_ buffer[3 ] =0 ; buffer[3 ] =hdmi_infoframe_checksum (buffer, len +4 ); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +4 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
drivers/media/i2c/adv7604.c +1 -1
@@ -2484,7 +2484,7 @@ static int adv76xx_read_infoframe(struct v4l2_subdev *sd, int index, buffer[i +3 ] =infoframe_read (sd, adv76xx_cri[index].payload_addr + i); -if (hdmi_infoframe_unpack (frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, adv76xx_cri[index].desc);return -ENOENT ;
drivers/media/i2c/adv7842.c +1 -1
@@ -2593,7 +2593,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7842_cfg_read_for (i =0 ; i < len; i++) buffer[i +3 ] =infoframe_read (sd, cri->payload_addr + i); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
Signature · 1 line
2.26.3