drm/panthor: fix firmware control interface bounds checks
Subsystems (4)
PATCH 1/1 drm/panthor: fix firmware control interface bounds checks
panthor_init_cs_iface() and panthor_init_csg_iface() validate firmware control interface offsets with 32-bit arithmetic and the size of the host wrapper structures. The offsets are derived from firmware-provided strides, so the arithmetic can wrap before the bounds check, and the host wrapper size is not the size of the firmware control interface being mapped.
Use 64-bit arithmetic for the computed offsets and validate against the actual firmware control interface structure sizes with subtraction-based bounds checks. Also validate that the shared section is large enough for the global control interface before using it.
--- drivers/gpu/drm/panthor/panthor_fw.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/panthor/panthor_fw.c +13 -6
@@ -897,15 +897,16 @@ static int panthor_init_cs_iface(struct panthor_device *ptdev,struct panthor_fw_csg_iface *csg_iface =panthor_fw_get_csg_iface (ptdev, csg_idx);struct panthor_fw_cs_iface *cs_iface = &ptdev->fw->iface.streams[csg_idx][cs_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + - (csg_idx * glb_iface->control->group_stride) + +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride) +CSF_STREAM_CONTROL_OFFSET + - (cs_idx * csg_iface->control->stream_stride); + ((u64 )cs_idx * csg_iface->control->stream_stride);struct panthor_fw_cs_iface *first_cs_iface =panthor_fw_get_cs_iface (ptdev,0 ,0 ); -if (iface_offset +sizeof (*cs_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*cs_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&cs_iface->lock); cs_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;
@@ -955,11 +956,13 @@ static int panthor_init_csg_iface(struct panthor_device *ptdev,struct panthor_fw_global_iface *glb_iface =panthor_fw_get_glb_iface (ptdev);struct panthor_fw_csg_iface *csg_iface = &ptdev->fw->iface.groups[csg_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + (csg_idx * glb_iface->control->group_stride); +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride);unsigned int i; -if (iface_offset +sizeof (*csg_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*csg_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&csg_iface->lock); csg_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;
@@ -1011,12 +1014,16 @@ static u32 panthor_get_instr_features(struct panthor_device *ptdev)static int panthor_fw_init_ifaces (struct panthor_device *ptdev) {struct panthor_fw_global_iface *glb_iface = &ptdev->fw->iface.global; +u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem);unsigned int i;if (!ptdev->fw->shared_section->mem->kmap)return -EINVAL ; +if (sizeof (*glb_iface->control) > shared_section_sz) +return -EINVAL ; +spin_lock_init (&glb_iface->lock); glb_iface->control = ptdev->fw->shared_section->mem->kmap;if (!glb_iface->control->version) {
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Missing size validation when converting firmware input/output virtual addresses to CPU pointers allows out-of-bounds memory access. --
--- Patch [1]: [PATCH] drm/panthor: fix firmware control interface bounds checks --- commit e72a8d4004139e04a7daa2f7b2eeb68178eeaccf
Author: Osama Abdelkader <[email protected]>
drm/panthor: fix firmware control interface bounds checks
This commit fixes firmware control interface bounds checks by using 64-bit arithmetic for computed offsets. It also correctly validates against the actual firmware control interface structure sizes.
Quoted 4 lines
drivers/gpu/drm/panthor/panthor_fw.c +0
-0
[ ... ]
Quoted 10 lines
drivers/gpu/drm/panthor/panthor_fw.c +2
-3@@ -878,14 +878,15 @@ static int panthor_init_cs_iface(struct panthor_device *ptdev,struct panthor_fw_csg_iface *csg_iface =panthor_fw_get_csg_iface (ptdev, csg_idx);struct panthor_fw_cs_iface *cs_iface = &ptdev->fw->iface.streams[csg_idx][cs_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + - (csg_idx * glb_iface->control->group_stride) + +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride) + CSF_STREAM_CONTROL_OFFSET + - (cs_idx * csg_iface->control->stream_stride);
drivers/gpu/drm/panthor/panthor_fw.c static int panthor_init_cs_iface(struct panthor_device *ptdev, · line 892
Quoted 10 lines
drivers/gpu/drm/panthor/panthor_fw.c +3
-1+ ((u64 )cs_idx * csg_iface->control->stream_stride);struct panthor_fw_cs_iface *first_cs_iface =panthor_fw_get_cs_iface (ptdev,0 ,0 ); -if (iface_offset +sizeof (*cs_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*cs_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&cs_iface->lock);
[Severity: High]
This is a pre-existing issue, but while you are adding bounds checking for the control structures, does this code also need size validation for the input and output structures?
Looking at panthor_init_cs_iface() right below this bounds check:
cs_iface->input = iface_fw_to_cpu_addr(ptdev, cs_iface->control->input_va); cs_iface->output = iface_fw_to_cpu_addr(ptdev, cs_iface->control->output_va);
The iface_fw_to_cpu_addr() function only verifies that the starting virtual address is within the shared_section bounds:
if (mcu_va < shared_mem_start || mcu_va >= shared_mem_end) return NULL;
If a malformed firmware provides an input_va or output_va near the very end of the shared section (for example, shared_mem_end - 1), wouldn't the driver read or write past the mapped memory boundary since the structure sizes aren't validated to fit within the remaining space?
This same pattern appears to exist for the group input/output pointers in panthor_init_csg_iface() and the global input/output pointers in panthor_fw_init_ifaces().
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 5 lines · Osama Abdelkader
panthor_init_cs_iface()andpanthor_init_csg_iface()validate firmware control interface offsets with 32-bit arithmetic and the size of the host wrapper structures. The offsets are derived from firmware-provided strides, so the arithmetic can wrap before the bounds check, and the host wrapper size is not the size of the firmware control interface being mapped.
How can the offsets wrap with the firmware-provided strides? It's not like the firmware provides arbitrarily large strides.
Quoted 74 lines
Use 64-bit arithmetic for the computed offsets and validate against the actual firmware control interface structure sizes with subtraction-based bounds checks. Also validate that the shared section is large enough for the global control interface before using it.
Fixes 2718d91816ee ("drm/panthor: Add the FW logical block")Signed-off-by Osama Abdelkader <[email protected]>--- drivers/gpu/drm/panthor/panthor_fw.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)drivers/gpu/drm/panthor/panthor_fw.c +13
-6@@ -897,15 +897,16 @@ static int panthor_init_cs_iface(struct panthor_device *ptdev,struct panthor_fw_csg_iface *csg_iface =panthor_fw_get_csg_iface (ptdev, csg_idx);struct panthor_fw_cs_iface *cs_iface = &ptdev->fw->iface.streams[csg_idx][cs_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + - (csg_idx * glb_iface->control->group_stride) + +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride) +CSF_STREAM_CONTROL_OFFSET + - (cs_idx * csg_iface->control->stream_stride); + ((u64 )cs_idx * csg_iface->control->stream_stride);struct panthor_fw_cs_iface *first_cs_iface =panthor_fw_get_cs_iface (ptdev,0 ,0 ); -if (iface_offset +sizeof (*cs_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*cs_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&cs_iface->lock); cs_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;@@ -955,11 +956,13 @@ static int panthor_init_csg_iface(struct panthor_device *ptdev,struct panthor_fw_global_iface *glb_iface =panthor_fw_get_glb_iface (ptdev);struct panthor_fw_csg_iface *csg_iface = &ptdev->fw->iface.groups[csg_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + (csg_idx * glb_iface->control->group_stride); +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride);unsigned int i; -if (iface_offset +sizeof (*csg_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*csg_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&csg_iface->lock); csg_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;@@ -1011,12 +1014,16 @@ static u32 panthor_get_instr_features(struct panthor_device *ptdev)static int panthor_fw_init_ifaces (struct panthor_device *ptdev) {struct panthor_fw_global_iface *glb_iface = &ptdev->fw->iface.global; +u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem);unsigned int i;if (!ptdev->fw->shared_section->mem->kmap)return -EINVAL ; +if (sizeof (*glb_iface->control) > shared_section_sz) +return -EINVAL ; +spin_lock_init (&glb_iface->lock); glb_iface->control = ptdev->fw->shared_section->mem->kmap;if (!glb_iface->control->version) {Signature · 1 line
2.43.0
I'm OK with the general content of the patch, so:
Best regards,
Liviu
Signature · 8 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯Quoted 10 lines · Liviu Dudau
Quoted 5 lines · Osama Abdelkader
panthor_init_cs_iface()andpanthor_init_csg_iface()validate firmware control interface offsets with 32-bit arithmetic and the size of the host wrapper structures. The offsets are derived from firmware-provided strides, so the arithmetic can wrap before the bounds check, and the host wrapper size is not the size of the firmware control interface being mapped.How can the offsets wrap with the firmware-provided strides? It's not like the firmware provides arbitrarily large strides.
Thanks for the review. Yes, It's unlikely to happen but good to have, these patches actually address issues reported by sashiko while reviewing the first two patches regarding firmware sections with oversized data and truncated firmware.
Quoted 77 lines
Quoted 74 lines
Use 64-bit arithmetic for the computed offsets and validate against the actual firmware control interface structure sizes with subtraction-based bounds checks. Also validate that the shared section is large enough for the global control interface before using it.
Fixes 2718d91816ee ("drm/panthor: Add the FW logical block")Signed-off-by Osama Abdelkader <[email protected]>--- drivers/gpu/drm/panthor/panthor_fw.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)drivers/gpu/drm/panthor/panthor_fw.c +13
-6@@ -897,15 +897,16 @@ static int panthor_init_cs_iface(struct panthor_device *ptdev,struct panthor_fw_csg_iface *csg_iface =panthor_fw_get_csg_iface (ptdev, csg_idx);struct panthor_fw_cs_iface *cs_iface = &ptdev->fw->iface.streams[csg_idx][cs_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + - (csg_idx * glb_iface->control->group_stride) + +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride) +CSF_STREAM_CONTROL_OFFSET + - (cs_idx * csg_iface->control->stream_stride); + ((u64 )cs_idx * csg_iface->control->stream_stride);struct panthor_fw_cs_iface *first_cs_iface =panthor_fw_get_cs_iface (ptdev,0 ,0 ); -if (iface_offset +sizeof (*cs_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*cs_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&cs_iface->lock); cs_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;@@ -955,11 +956,13 @@ static int panthor_init_csg_iface(struct panthor_device *ptdev,struct panthor_fw_global_iface *glb_iface =panthor_fw_get_glb_iface (ptdev);struct panthor_fw_csg_iface *csg_iface = &ptdev->fw->iface.groups[csg_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + (csg_idx * glb_iface->control->group_stride); +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride);unsigned int i; -if (iface_offset +sizeof (*csg_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*csg_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&csg_iface->lock); csg_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;@@ -1011,12 +1014,16 @@ static u32 panthor_get_instr_features(struct panthor_device *ptdev)static int panthor_fw_init_ifaces (struct panthor_device *ptdev) {struct panthor_fw_global_iface *glb_iface = &ptdev->fw->iface.global; +u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem);unsigned int i;if (!ptdev->fw->shared_section->mem->kmap)return -EINVAL ; +if (sizeof (*glb_iface->control) > shared_section_sz) +return -EINVAL ; +spin_lock_init (&glb_iface->lock); glb_iface->control = ptdev->fw->shared_section->mem->kmap;if (!glb_iface->control->version) {Signature · 1 line
2.43.0I'm OK with the general content of the patch, so:
Quoted 15 lines
Reviewed-by Liviu Dudau <[email protected]>Best regards,
LiviuSignature · 8 lines
==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯
Thank you.
Best regards,
Osama
Quoted 6 lines · Osama Abdelkader
panthor_init_cs_iface()andpanthor_init_csg_iface()validate firmware control interface offsets with 32-bit arithmetic and the size of the host wrapper structures. The offsets are derived from firmware-provided strides, so the arithmetic can wrap before the bounds check, and the host wrapper size is not the size of the firmware control interface being mapped.
Quoted 8 lines
Use 64-bit arithmetic for the computed offsets and validate against the actual firmware control interface structure sizes with subtraction-based bounds checks. Also validate that the shared section is large enough for the global control interface before using it.
Fixes 2718d91816ee ("drm/panthor: Add the FW logical block")Signed-off-by Osama Abdelkader <[email protected]>
As Liviu pointed out some of this seems a bit unlikely, but I don't disagree with any of the changes, so:
Thanks,
Steve
Quoted 62 lines
--- drivers/gpu/drm/panthor/panthor_fw.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)drivers/gpu/drm/panthor/panthor_fw.c +13
-6@@ -897,15 +897,16 @@ static int panthor_init_cs_iface(struct panthor_device *ptdev,struct panthor_fw_csg_iface *csg_iface =panthor_fw_get_csg_iface (ptdev, csg_idx);struct panthor_fw_cs_iface *cs_iface = &ptdev->fw->iface.streams[csg_idx][cs_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + - (csg_idx * glb_iface->control->group_stride) + +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride) +CSF_STREAM_CONTROL_OFFSET + - (cs_idx * csg_iface->control->stream_stride); + ((u64 )cs_idx * csg_iface->control->stream_stride);struct panthor_fw_cs_iface *first_cs_iface =panthor_fw_get_cs_iface (ptdev,0 ,0 ); -if (iface_offset +sizeof (*cs_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*cs_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&cs_iface->lock); cs_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;@@ -955,11 +956,13 @@ static int panthor_init_csg_iface(struct panthor_device *ptdev,struct panthor_fw_global_iface *glb_iface =panthor_fw_get_glb_iface (ptdev);struct panthor_fw_csg_iface *csg_iface = &ptdev->fw->iface.groups[csg_idx];u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem); -u32 iface_offset =CSF_GROUP_CONTROL_OFFSET + (csg_idx * glb_iface->control->group_stride); +u64 iface_offset =CSF_GROUP_CONTROL_OFFSET + + ((u64 )csg_idx * glb_iface->control->group_stride);unsigned int i; -if (iface_offset +sizeof (*csg_iface) >= shared_section_sz) +if (iface_offset > shared_section_sz || +sizeof (*csg_iface->control) > shared_section_sz - iface_offset)return -EINVAL ;spin_lock_init (&csg_iface->lock); csg_iface->control = ptdev->fw->shared_section->mem->kmap + iface_offset;@@ -1011,12 +1014,16 @@ static u32 panthor_get_instr_features(struct panthor_device *ptdev)static int panthor_fw_init_ifaces (struct panthor_device *ptdev) {struct panthor_fw_global_iface *glb_iface = &ptdev->fw->iface.global; +u64 shared_section_sz =panthor_kernel_bo_size (ptdev->fw->shared_section->mem);unsigned int i;if (!ptdev->fw->shared_section->mem->kmap)return -EINVAL ; +if (sizeof (*glb_iface->control) > shared_section_sz) +return -EINVAL ; +spin_lock_init (&glb_iface->lock); glb_iface->control = ptdev->fw->shared_section->mem->kmap;if (!glb_iface->control->version) {