Skip to content

Scheduler: fix a NULL pointer dereference #11003

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

Merged
kv2019i merged 2 commits into from
Jul 17, 2026
Merged

Scheduler: fix a NULL pointer dereference #11003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3671884
schedule: fix regression with DRAM execution debugging
lyakh Jul 16, 2026
4d03f81
schedule: make 2 initialisation functions __cold
lyakh Jul 16, 2026
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
3 changes: 3 additions & 0 deletions src/include/sof/schedule/schedule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ static inline void *scheduler_get_data(uint16_t type)
struct schedule_data *sch;
struct list_item *slist;

if (!schedulers)
return NULL;

list_for_item(slist, &schedulers->list) {
sch = container_of(slist, struct schedule_data, list);
if (type == sch->type)
Expand Down
8 changes: 6 additions & 2 deletions src/schedule/schedule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,13 @@ int schedule_task_init(struct task *task,
return 0;
}

static void scheduler_register(struct schedule_data *scheduler)
__cold static void scheduler_register(struct schedule_data *scheduler)
{
struct schedulers **sch = arch_schedulers_get();
struct k_heap *heap = NULL;

assert_can_be_cold();

if (IS_ENABLED(CONFIG_SOF_USERSPACE_LL) && scheduler_is_user(scheduler->type)) {
sch = arch_user_schedulers_get();
heap = sof_sys_user_heap_get();
Expand All @@ -105,11 +107,13 @@ static void scheduler_register(struct schedule_data *scheduler)
list_item_append(&scheduler->list, &(*sch)->list);
}

void scheduler_init(int type, const struct scheduler_ops *ops, void *data)
__cold void scheduler_init(int type, const struct scheduler_ops *ops, void *data)
{
struct schedule_data *sch;
struct k_heap *heap = NULL;

assert_can_be_cold();

if (IS_ENABLED(CONFIG_SOF_USERSPACE_LL) && scheduler_is_user(type))
heap = sof_sys_user_heap_get();

Expand Down
3 changes: 2 additions & 1 deletion src/schedule/zephyr_domain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,8 @@ struct ll_schedule_domain *zephyr_domain_init(int clk)
/* Check if currently running in the LL scheduler thread context */
bool ll_sch_is_current(void)
{
struct zephyr_domain *zephyr_domain = ll_sch_domain_get_pdata(zephyr_ll_domain());
struct ll_schedule_domain *ll_dom = zephyr_ll_domain();
struct zephyr_domain *zephyr_domain = ll_dom ? ll_sch_domain_get_pdata(ll_dom) : NULL;

if (!zephyr_domain)
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/schedule/zephyr_ll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,5 +769,5 @@ struct ll_schedule_domain *zephyr_ll_domain(void)
{
struct zephyr_ll *ll_sch = scheduler_get_data(SOF_SCHEDULE_LL_TIMER);

return ll_sch->ll_domain;
return ll_sch ? ll_sch->ll_domain : NULL;
}
Loading