Skip to content

up_down_mixer: reject unsupported channel configurations#10890

Merged
lgirdwood merged 1 commit into
thesofproject:mainfrom
abonislawski:fix/upd-mix-check
Jun 12, 2026
Merged

up_down_mixer: reject unsupported channel configurations#10890
lgirdwood merged 1 commit into
thesofproject:mainfrom
abonislawski:fix/upd-mix-check

Conversation

@abonislawski

Copy link
Copy Markdown
Member

init_mix() left mix_routine NULL for combos unhandled by select_mix_out_*() but accepted by set_downmix_coefficients()
add NULL-check before calling set_downmix_coefficients()

init_mix() left mix_routine NULL for combos unhandled by
select_mix_out_*() but accepted by set_downmix_coefficients()
add NULL-check before calling set_downmix_coefficients()

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
Copilot AI review requested due to automatic review settings June 12, 2026 06:44

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR prevents the up/down mixer from accepting unsupported input/output channel configurations by rejecting cases where select_mix_out_*() fails to choose a mixing routine, avoiding later NULL function-pointer use.

Changes:

  • Add an init_mix() guard that rejects configurations when cd->mix_routine is NULL.
  • Emit an error log and return -EINVAL for unsupported channel configurations.

Comment thread src/audio/up_down_mixer/up_down_mixer.c
@lgirdwood lgirdwood merged commit 34a8d7c into thesofproject:main Jun 12, 2026
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants