accel/ethosu: fix two command stream parser bugs
cover accel/ethosu: fix two command stream parser bugs
While investigating the IFM region index out-of-bounds fix already sent [1], two additional bugs were found in the same command stream parser function ethosu_gem_cmdstream_copy_and_validate():
Patch 1: NPU_OP_RESIZE unconditionally triggers WARN_ON(1), allowing any unprivileged user with DRM device access to spam the kernel log or panic the kernel if panic_on_warn is set.
Patch 2: NPU_SET_SCALE1_LENGTH on U85 hardware assigns the user-supplied length to weight[1] instead of weight[2], mismatching its BASE handler and corrupting the software bounds-check state for both weight buffers.
Both fixes apply cleanly on top of the IFM patch and target the same
Fixes: tag since all three bugs originate in the same commit.
[1] <[email protected]>
Muhammad Bilal (2):
accel/ethosu: reject NPU_OP_RESIZE commands from userspace accel/ethosu: fix wrong weight index in NPU_SET_SCALE1_LENGTH on U85
drivers/accel/ethosu/ethosu_gem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/2 accel/ethosu: reject NPU_OP_RESIZE commands from userspace
NPU_OP_RESIZE is a U85-only command that the driver does not yet implement. The existing WARN_ON(1) placeholder fires unconditionally whenever userspace submits this command via DRM_IOCTL_ETHOSU_GEM_CREATE, causing unbounded kernel log spam.
If panic_on_warn is set the kernel panics, giving any unprivileged user with access to the DRM device a trivial denial-of-service primitive.
Replace the WARN_ON(1) with an explicit -EINVAL return so the ioctl rejects the command before it reaches hardware.
--- drivers/accel/ethosu/ethosu_gem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/accel/ethosu/ethosu_gem.c +1 -2
@@ -433,8 +433,7 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev,return ret;break ;case NPU_OP_RESIZE :// U85 only -WARN_ON (1 );// TODO -break ; +return -EINVAL ;case NPU_SET_KERNEL_WIDTH_M1 : st.ifm.width = param;break ;
Signature · 1 line
2.53.0
PATCH 2/2 accel/ethosu: fix wrong weight index in NPU_SET_SCALE1_LENGTH on U85
In reply to Muhammad BilalOn non-U65 hardware (e.g. U85), opcode 0x4093 is NPU_SET_WEIGHT2_LENGTH. The BASE handler for the same opcode correctly assigns to st.weight[2].base, but the LENGTH handler mistakenly assigns cmds[1] to st.weight[1].length instead of st.weight[2].length.
This leaves weight[2].length at its initialised sentinel value of 0xffffffff and corrupts weight[1].length with the user-supplied value, breaking the software bounds-check state for both weight buffers on U85.
Fix the index to match the BASE handler.
--- drivers/accel/ethosu/ethosu_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/ethosu/ethosu_gem.c +1 -1
@@ -600,7 +600,7 @@ static int ethosu_gem_cmdstream_copy_and_validate(struct drm_device *ddev,if (ethosu_is_u65 (edev)) st.scale[1 ].length = cmds[1 ];else - st.weight[1 ].length = cmds[1 ]; + st.weight[2 ].length = cmds[1 ];break ;case NPU_SET_WEIGHT3_BASE : st.weight[3 ].base = addr;
Signature · 1 line
2.53.0