drm/nouveau: fix a use-after-free in r535_gsp_rpc_push()
Subsystems (3)
PATCH v2 1/1 drm/nouveau: fix a use-after-free in r535_gsp_rpc_push()
The RPC container is released after being passed to r535_gsp_rpc_send().
When sending the initial fragment of a large RPC and passing the caller's RPC container, the container will be freed prematurely. Subsequent attempts to send remaining fragments will therefore result in a use-after-free.
Allocate a temporary RPC container for holding the initial fragment of a large RPC when sending. Free the caller's container when all fragments are successfully sent.
---
v2:
- Avoid unnecessary length adjusting on caller's RPC container as a new RPC container is going to be used.
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +12 -5
@@ -978,12 +978,18 @@ r535_gsp_rpc_push(struct nvkm_gsp *gsp, void *payload,if (payload_size > max_payload_size) {const u32 fn = rpc->function;u32 remain_payload_size = payload_size; +void *next; -/* Adjust length, and send initial RPC. */ - rpc->length =sizeof (*rpc) + max_payload_size; - msg->checksum = rpc->length; +/* Send initial RPC. */ + next =r535_gsp_rpc_get (gsp, fn, max_payload_size); +if (IS_ERR (next)) { + repv = next; + goto done; + } - repv =r535_gsp_rpc_send (gsp, payload,NVKM_GSP_RPC_REPLY_NOWAIT ,0 ); +memcpy (next, payload, max_payload_size); + + repv =r535_gsp_rpc_send (gsp, next,NVKM_GSP_RPC_REPLY_NOWAIT ,0 );if (IS_ERR (repv)) goto done;
@@ -994,7 +1000,6 @@ r535_gsp_rpc_push(struct nvkm_gsp *gsp, void *payload,while (remain_payload_size) {u32 size =min (remain_payload_size, max_payload_size); -void *next; next =r535_gsp_rpc_get (gsp,NV_VGPU_MSG_FUNCTION_CONTINUATION_RECORD , size);if (IS_ERR (next)) {
@@ -1015,6 +1020,8 @@ r535_gsp_rpc_push(struct nvkm_gsp *gsp, void *payload,/* Wait for reply. */ repv =r535_gsp_rpc_handle_reply (gsp, fn, policy, payload_size +sizeof (*rpc)); +if (!IS_ERR (repv)) +kvfree (msg); }else { repv =r535_gsp_rpc_send (gsp, payload, policy, gsp_rpc_len); }
Signature · 1 line
2.43.5
Quoted 7 lines · Zhi Wang
The RPC container is released after being passed to
r535_gsp_rpc_send().When sending the initial fragment of a large RPC and passing the caller's RPC container, the container will be freed prematurely. Subsequent attempts to send remaining fragments will therefore result in a use-after-free.
Quoted 6 lines
Allocate a temporary RPC container for holding the initial fragment of a large RPC when sending. Free the caller's container when all fragments are successfully sent.
Fixes 176fdcbddfd2 ("drm/nouveau/gsp/r535: add support for booting GSP-RM")Signed-off-by Zhi Wang <[email protected]>
Applied to drm-misc-fixes, thanks!