Skip to content

schedule: zephyr_ll: read task priv_data once in sem syscalls #11343

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
kv2019i wants to merge 1 commit into
base: main
Choose a base branch
from
Open

schedule: zephyr_ll: read task priv_data once in sem syscalls #11343

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
56 changes: 44 additions & 12 deletions src/schedule/zephyr_ll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,12 @@ struct zephyr_ll_task_sem {
struct list_item list;
};

int z_impl_zephyr_ll_task_sem_alloc(struct task *task)
/*
* The syscall validators pass in pdata that they read once from user memory
* and validated, so these helpers must not read task->priv_data again.
*/
static int zephyr_ll_task_sem_alloc_pdata(struct task *task, struct zephyr_ll_pdata *pdata)
{
struct zephyr_ll_pdata *pdata = task->priv_data;
struct zephyr_ll_task_sem *ts = rmalloc(SOF_MEM_FLAG_COHERENT, sizeof(*ts));

if (!ts)
Expand Down Expand Up @@ -502,9 +505,13 @@ int z_impl_zephyr_ll_task_sem_alloc(struct task *task)
return 0;
}

int z_impl_zephyr_ll_task_sem_free(struct task *task)
int z_impl_zephyr_ll_task_sem_alloc(struct task *task)
{
return zephyr_ll_task_sem_alloc_pdata(task, task->priv_data);
}

static int zephyr_ll_task_sem_free_pdata(struct task *task, struct zephyr_ll_pdata *pdata)
{
struct zephyr_ll_pdata *pdata = task->priv_data;
struct list_item *list;
struct zephyr_ll_task_sem *ts;
bool found = false;
Expand All @@ -531,31 +538,56 @@ int z_impl_zephyr_ll_task_sem_free(struct task *task)
return 0;
}

int z_impl_zephyr_ll_task_sem_free(struct task *task)
{
return zephyr_ll_task_sem_free_pdata(task, task->priv_data);
}

#ifdef CONFIG_USERSPACE
#include <zephyr/internal/syscall_handler.h>
/*
* Read task->priv_data exactly once. The task lives in user memory and a
* thread on another core can change the pointer after it has been checked.
*
* @return validated pdata pointer, or NULL if the task has none
*/
static struct zephyr_ll_pdata *zephyr_ll_task_pdata_vrfy(struct task *task)
{
struct zephyr_ll_pdata *pdata;

K_OOPS(K_SYSCALL_MEMORY_WRITE(task, sizeof(*task)));
K_OOPS(k_usermode_from_copy(&pdata, &task->priv_data, sizeof(pdata)));
if (pdata)
K_OOPS(K_SYSCALL_MEMORY_WRITE(pdata, sizeof(*pdata)));

return pdata;
}

static inline int z_vrfy_zephyr_ll_task_sem_alloc(struct task *task)
{
struct zephyr_ll_pdata *pdata;

if (!task)
return -EINVAL;
K_OOPS(K_SYSCALL_MEMORY_WRITE(task, sizeof(*task)));
if (!task->priv_data)
pdata = zephyr_ll_task_pdata_vrfy(task);
if (!pdata)
return -EINVAL;
K_OOPS(K_SYSCALL_MEMORY_WRITE(task->priv_data, sizeof(struct zephyr_ll_pdata)));

return z_impl_zephyr_ll_task_sem_alloc(task);
return zephyr_ll_task_sem_alloc_pdata(task, pdata);
}
#include <zephyr/syscalls/zephyr_ll_task_sem_alloc_mrsh.c>

static inline int z_vrfy_zephyr_ll_task_sem_free(struct task *task)
{
struct zephyr_ll_pdata *pdata;

if (!task)
return -EINVAL;
K_OOPS(K_SYSCALL_MEMORY_WRITE(task, sizeof(*task)));
if (!task->priv_data)
pdata = zephyr_ll_task_pdata_vrfy(task);
if (!pdata)
return -EINVAL;
K_OOPS(K_SYSCALL_MEMORY_WRITE(task->priv_data, sizeof(struct zephyr_ll_pdata)));

return z_impl_zephyr_ll_task_sem_free(task);
return zephyr_ll_task_sem_free_pdata(task, pdata);
}
#include <zephyr/syscalls/zephyr_ll_task_sem_free_mrsh.c>
#endif /* CONFIG_USERSPACE */
Expand Down
Loading