Skip to content

ipc3: helper: clear component pipeline pointers before freeing pipeline #10852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tmleman wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −0
Open

ipc3: helper: clear component pipeline pointers before freeing pipeline #10852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/ipc/ipc3/helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc)
int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id)
{
struct ipc_comp_dev *ipc_pipe;
struct ipc_comp_dev *icd;
struct list_item *clist;
int ret;

Comment thread
tmleman marked this conversation as resolved.
/* check whether pipeline exists */
Expand All @@ -457,6 +459,19 @@ int ipc_pipeline_free(struct ipc *ipc, uint32_t comp_id)
if (!cpu_is_me(ipc_pipe->core))
return ipc_process_on_core(ipc_pipe->core, false);

/* Clear stale cd->pipeline pointers on all components and buffers
* that still belong to this pipeline. A well-behaved host driver
* frees components before freeing the pipeline, but if it does not
* (or in fuzz/error paths) the dangling pointer would be a
* use-after-free on any subsequent IPC referencing that component.
*/
list_for_item(clist, &ipc->comp_list) {
icd = container_of(clist, struct ipc_comp_dev, list);
if (icd->type == COMP_TYPE_COMPONENT &&
icd->cd && icd->cd->pipeline == ipc_pipe->pipeline)
icd->cd->pipeline = NULL;
}

/* free buffer and remove from list */
ret = pipeline_free(ipc_pipe->pipeline);
if (ret < 0) {
Expand Down
Loading