accel/ivpu: Add bounds check for firmware runtime memory
Subsystems (3)
Andrzej Kacprowski
maintainerPATCH 1/1 accel/ivpu: Add bounds check for firmware runtime memory
Validate that the firmware runtime memory specified in the image header is properly aligned and sized to hold the firmware image. This prevents errors during memory allocation and image transfer.
--- drivers/accel/ivpu/ivpu_fw.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/accel/ivpu/ivpu_fw.c +16 -0
@@ -259,6 +259,22 @@ static int ivpu_fw_parse(struct ivpu_device *vdev)return -EINVAL ; } +if (!PAGE_ALIGNED (runtime_addr)) { +ivpu_err (vdev,"Runtime address 0x%llx not page aligned\n" , runtime_addr); +return -EINVAL ; + } + +if (!PAGE_ALIGNED (runtime_size)) { +ivpu_err (vdev,"Runtime size %llu not page aligned\n" , runtime_size); +return -EINVAL ; + } + +if (runtime_size < image_size) { +ivpu_err (vdev,"Runtime size too small: %llu, image size: %llu\n" , + runtime_size, image_size); +return -EINVAL ; + } +if (!ivpu_is_within_range (image_load_addr, image_size, &vdev->hw->ranges.runtime)) {ivpu_err (vdev,"Invalid firmware load address: 0x%llx and size %llu\n" , image_load_addr, image_size);
Signature · 1 line
2.43.0
Quoted 7 lines · Andrzej Kacprowski
Validate that the firmware runtime memory specified in the image header is properly aligned and sized to hold the firmware image. This prevents errors during memory allocation and image transfer.
Fixes 2007e210b6a1 ("accel/ivpu: Split FW runtime and global memory buffers")Cc <[email protected]> # v7.0+Signed-off-by Andrzej Kacprowski <[email protected]>
Quoted 31 lines
--- drivers/accel/ivpu/ivpu_fw.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/accel/ivpu/ivpu_fw.c +16
-0@@ -259,6 +259,22 @@ static int ivpu_fw_parse(struct ivpu_device *vdev)return -EINVAL ; } +if (!PAGE_ALIGNED (runtime_addr)) { +ivpu_err (vdev,"Runtime address 0x%llx not page aligned\n" , runtime_addr); +return -EINVAL ; + } + +if (!PAGE_ALIGNED (runtime_size)) { +ivpu_err (vdev,"Runtime size %llu not page aligned\n" , runtime_size); +return -EINVAL ; + } + +if (runtime_size < image_size) { +ivpu_err (vdev,"Runtime size too small: %llu, image size: %llu\n" , + runtime_size, image_size); +return -EINVAL ; + } +if (!ivpu_is_within_range (image_load_addr, image_size, &vdev->hw->ranges.runtime)) {ivpu_err (vdev,"Invalid firmware load address: 0x%llx and size %llu\n" , image_load_addr, image_size);
Quoted 11 lines · Karol
Quoted 7 lines · Andrzej Kacprowski
Validate that the firmware runtime memory specified in the image header is properly aligned and sized to hold the firmware image. This prevents errors during memory allocation and image transfer.
Fixes 2007e210b6a1 ("accel/ivpu: Split FW runtime and global memory buffers")Cc <[email protected]> # v7.0+Signed-off-by Andrzej Kacprowski <[email protected]>Reviewed-by Karol Wachowski <[email protected]>
Applied to drm-misc-fixes.
Quoted 36 lines
Quoted 34 lines
---
drivers/accel/ivpu/ivpu_fw.c| 16 ++++++++++++++++1 file changed, 16 insertions(+)drivers/accel/ivpu/ivpu_fw.c +16
-0@@ -259,6 +259,22 @@ static int ivpu_fw_parse(struct ivpu_device *vdev) return -EINVAL; } + if (!PAGE_ALIGNED(runtime_addr)) { + ivpu_err(vdev, "Runtime address 0x%llx not page aligned\n", runtime_addr); + return -EINVAL; + } + + if (!PAGE_ALIGNED(runtime_size)) { + ivpu_err(vdev, "Runtime size %llu not page aligned\n", runtime_size); + return -EINVAL; + } + + if (runtime_size < image_size) { + ivpu_err(vdev, "Runtime size too small: %llu, image size: %llu\n", + runtime_size, image_size); + return -EINVAL; + } +if (!ivpu_is_within_range(image_load_addr,
image_size, &vdev-Quoted 1 line
hw->ranges.runtime)) {
ivpu_err(vdev, "Invalid firmware load address: 0x%llx and size %llu\n", image_load_addr, image_size);