Skip to content
/ linux Public

Commit fade67c

Browse files
alperakSasha Levin
authored andcommitted
media: qcom: camss: vfe: Fix out-of-bounds access in vfe_isr_reg_update()
[ Upstream commit d965919 ] vfe_isr() iterates using MSM_VFE_IMAGE_MASTERS_NUM(7) as the loop bound and passes the index to vfe_isr_reg_update(). However, vfe->line[] array is defined with VFE_LINE_NUM_MAX(4): struct vfe_line line[VFE_LINE_NUM_MAX]; When index is 4, 5, 6, the access to vfe->line[line_id] exceeds the array bounds and resulting in out-of-bounds memory access. Fix this by using separate loops for output lines and write masters. Fixes: 4edc8ea ("media: camss: Add initial support for VFE hardware version Titan 480") Signed-off-by: Alper Ak <alperyasinak1@gmail.com> Cc: stable@vger.kernel.org Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent e5d08ef commit fade67c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/media/platform/qcom/camss/camss-vfe-480.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,13 @@ static irqreturn_t vfe_isr(int irq, void *dev)
202202
writel_relaxed(status, vfe->base + VFE_BUS_IRQ_CLEAR(0));
203203
writel_relaxed(1, vfe->base + VFE_BUS_IRQ_CLEAR_GLOBAL);
204204

205-
/* Loop through all WMs IRQs */
206-
for (i = 0; i < MSM_VFE_IMAGE_MASTERS_NUM; i++) {
205+
for (i = 0; i < MAX_VFE_OUTPUT_LINES; i++) {
207206
if (status & BUS_IRQ_MASK_0_RDI_RUP(vfe, i))
208207
vfe_isr_reg_update(vfe, i);
208+
}
209209

210+
/* Loop through all WMs IRQs */
211+
for (i = 0; i < MSM_VFE_IMAGE_MASTERS_NUM; i++) {
210212
if (status & BUS_IRQ_MASK_0_COMP_DONE(vfe, RDI_COMP_GROUP(i)))
211213
vfe_buf_done(vfe, i);
212214
}

0 commit comments

Comments
 (0)