media: qcom: camss: vfe: Fix out-of-bounds access in vfe_isr_reg_update()
Subsystems (4)
PATCH 1/1 media: qcom: camss: vfe: Fix out-of-bounds access in vfe_isr_reg_update()
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.
Add a bounds check to ensure line_id is within valid range before accessing the array.
--- drivers/media/platform/qcom/camss/camss-vfe-480.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/qcom/camss/camss-vfe-480.c +3 -0
@@ -237,6 +237,9 @@ static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)struct vfe_output *output;unsigned long flags; +if (line_id >=VFE_LINE_NUM_MAX ) +return ; +spin_lock_irqsave (&vfe->output_lock, flags);vfe_reg_update_clear (vfe, line_id);
Signature · 1 line
2.43.0
Bryan O'Donoghue
maintainerQuoted 23 lines · Alper Ak
vfe_isr()iterates usingMSM_VFE_IMAGE_MASTERS_NUM(7)as the loop bound and passes the index tovfe_isr_reg_update(). However, vfe->line[] array is defined withVFE_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.
Add a bounds check to ensure
line_idis within valid range before accessing the array.Fixes 4edc8eae715c ("media: camss: Add initial support for VFE hardware version Titan 480")Signed-off-by Alper Ak <[email protected]>--- drivers/media/platform/qcom/camss/camss-vfe-480.c | 3 +++ 1 file changed, 3 insertions(+)drivers/media/platform/qcom/camss/camss-vfe-480.c +0
-0
drivers/media/platform/qcom/camss/camss-vfe-480.c static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id) · line 245
Quoted 9 lines
drivers/media/platform/qcom/camss/camss-vfe-480.c +3
-0@@ -237,6 +237,9 @@ static void vfe_isr_reg_update(struct vfe_device *vfe, enum vfe_line_id line_id)struct vfe_output *output;unsigned long flags; +if (line_id >=VFE_LINE_NUM_MAX ) +return ; +spin_lock_irqsave (&vfe->output_lock, flags);vfe_reg_update_clear (vfe, line_id);
A logical bug.
I think we shouldn't be calling this function at all with a index that is too large though.
Something like this instead. An explicit loop for the output lines and another loop for the write-master completions.
drivers/media/platform/qcom/camss/camss-vfe-480.c +4 -2
@@ -202,11 +202,13 @@ static irqreturn_t vfe_isr(int irq, void *dev)writel_relaxed (status, vfe->base +VFE_BUS_IRQ_CLEAR (0 ));writel_relaxed (1 , vfe->base +VFE_BUS_IRQ_CLEAR_GLOBAL ); -/* Loop through all WMs IRQs */ - for (i = 0; i < MSM_VFE_IMAGE_MASTERS_NUM; i++) { +for (i =0 ; i <MAX_VFE_OUTPUT_LINES ; i++) {if (status &BUS_IRQ_MASK_0_RDI_RUP (vfe, i))vfe_isr_reg_update (vfe, i); + } +/* Loop through all WMs IRQs */ + for (i = 0; i < MSM_VFE_IMAGE_MASTERS_NUM; i++) { if (status & BUS_IRQ_MASK_0_COMP_DONE(vfe,
RDI_COMP_GROUP(i)))
vfe_buf_done(vfe, i);
}---
bod
PATCH v2 1/1 media: qcom: camss: vfe: Fix out-of-bounds access in vfe_isr_reg_update()
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.
--- drivers/media/platform/qcom/camss/camss-vfe-480.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-480.c +4 -2
@@ -202,11 +202,13 @@ static irqreturn_t vfe_isr(int irq, void *dev)writel_relaxed (status, vfe->base +VFE_BUS_IRQ_CLEAR (0 ));writel_relaxed (1 , vfe->base +VFE_BUS_IRQ_CLEAR_GLOBAL ); -/* Loop through all WMs IRQs */ -for (i =0 ; i <MSM_VFE_IMAGE_MASTERS_NUM ; i++) { +for (i =0 ; i <MAX_VFE_OUTPUT_LINES ; i++) {if (status &BUS_IRQ_MASK_0_RDI_RUP (vfe, i))vfe_isr_reg_update (vfe, i); + } +/* Loop through all WMs IRQs */ +for (i =0 ; i <MSM_VFE_IMAGE_MASTERS_NUM ; i++) {if (status &BUS_IRQ_MASK_0_COMP_DONE (vfe,RDI_COMP_GROUP (i)))vfe_buf_done (vfe, i); }
Signature · 1 line
2.43.0
Quoted 27 lines · Alper Ak
vfe_isr()iterates usingMSM_VFE_IMAGE_MASTERS_NUM(7)as the loop bound and passes the index tovfe_isr_reg_update(). However, vfe->line[] array is defined withVFE_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 4edc8eae715c ("media: camss: Add initial support for VFE hardware version Titan 480")Signed-off-by Alper Ak <[email protected]>--- drivers/media/platform/qcom/camss/camss-vfe-480.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/media/platform/qcom/camss/camss-vfe-480.c +0
-2@@ -202,11 +202,13 @@ static irqreturn_t vfe_isr(int irq, void *dev)writel_relaxed (status, vfe->base +VFE_BUS_IRQ_CLEAR (0 ));writel_relaxed (1 , vfe->base +VFE_BUS_IRQ_CLEAR_GLOBAL ); -/* Loop through all WMs IRQs */ -for (i =0 ; i <MSM_VFE_IMAGE_MASTERS_NUM ; i++) {
drivers/media/platform/qcom/camss/camss-vfe-480.c static irqreturn_t vfe_isr(int irq, void *dev) · line 214
Quoted 10 lines
drivers/media/platform/qcom/camss/camss-vfe-480.c +4
-0+for (i =0 ; i <MAX_VFE_OUTPUT_LINES ; i++) {if (status &BUS_IRQ_MASK_0_RDI_RUP (vfe, i))vfe_isr_reg_update (vfe, i); + } +/* Loop through all WMs IRQs */ +for (i =0 ; i <MSM_VFE_IMAGE_MASTERS_NUM ; i++) {if (status &BUS_IRQ_MASK_0_COMP_DONE (vfe,RDI_COMP_GROUP (i)))vfe_buf_done (vfe, i); }
LGTM - assuming hardware tests pass.
---
bod