media: adv7604: avoid negative array index in log_status when cp_read fails
Subsystems (2)
PATCH 1/3 media: adv7604: avoid negative array index in log_status when cp_read fails
cp_read() returns the negative errno from regmap_read() on I2C failure. adv76xx_log_status() shifts the result right by 4 and uses it directly to index csc_coeff_sel_rb[16] causing the right shift of a negative number to result in -1, reading a negative place in the array.
Commit 8163419e3e05 ("media: adv7842: Avoid possible out-of-bounds array accesses in adv7842_cp_log_status()") fixed the identical pattern in the adv7842, so do the same thing here.
--- drivers/media/i2c/adv7604.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/i2c/adv7604.c +2 -1
@@ -2641,8 +2641,9 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) "(16-235)" : "(0-255)", (reg_io_0x02 & 0x08) ? "enabled" : "disabled"); } + ret =cp_read (sd, info->cp_csc) >>4 ;v4l2_info (sd,"Color space conversion: %s\n" , - csc_coeff_sel_rb[cp_read (sd, info->cp_csc) >>4 ]); + ret <0 ?"" : csc_coeff_sel_rb[ret]);if (!is_digital_input (sd))return 0 ;
Signature · 1 line
2.53.0
PATCH 2/3 media: stv090x: bound DiSEqC reply length to msg[] size
The FIFO_BYTENBR_FIELD register field is 4 bits wide, giving a length of 0..15, but reply->msg is __u8[4] in struct dvb_diseqc_slave_reply. A faulty or malicious DiSEqC slave (or i2c bus glitch) reporting more than 4 bytes will the array and clobber the stack.
The stb0899, tda10071, and s5h1420 drivers all properly bound the FIFO count against sizeof(reply->msg) before the read loop, so do the same thing in this driver.
--- drivers/media/dvb-frontends/stv090x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/dvb-frontends/stv090x.c +2 -0
@@ -3902,6 +3902,8 @@ static int stv090x_recv_slave_reply(struct dvb_frontend *fe, struct dvb_diseqc_sif (rx_end) { reply->msg_len =STV090x_GETFIELD_Px (reg,FIFO_BYTENBR_FIELD ); +if (reply->msg_len >sizeof (reply->msg)) + reply->msg_len =sizeof (reply->msg);for (i =0 ; i < reply->msg_len; i++) reply->msg[i] =STV090x_READ_DEMOD (state,DISRXDATA ); }
Signature · 1 line
2.53.0
PATCH 3/3 media: stv0900: bound DiSEqC reply length to msg[] size
In reply to Greg Kroah-HartmanThe FIFO_BYTENBR field is 4 bits (mask 0x0f), giving a length of 0..15 but reply->msg is __u8[4] in struct dvb_diseqc_slave_reply. A faulty or malicious device reporting more than 4 bytes will the array and clobber the stack.
The stb0899, tda10071, and s5h1420 drivers all properly bound the FIFO count against sizeof(reply->msg) before the read loop, so do the same thing in this driver.
--- drivers/media/dvb-frontends/stv0900_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/dvb-frontends/stv0900_core.c +2 -0
@@ -1773,6 +1773,8 @@ static int stv0900_recv_slave_reply(struct dvb_frontend *fe,if (stv0900_get_bits (intp,RX_END )) { reply->msg_len =stv0900_get_bits (intp,FIFO_BYTENBR ); +if (reply->msg_len >sizeof (reply->msg)) + reply->msg_len =sizeof (reply->msg);for (i =0 ; i < reply->msg_len; i++) reply->msg[i] =stv0900_read_reg (intp,DISRXDATA );
Signature · 1 line
2.53.0