OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

selector: avoid array overflow 

Check source and sink channels to avoid accessing beyond array
boundaries.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2022-12-20 14:25:46 +01:00 committed by Liam Girdwood
parent 24062b456e
commit d5e97949a2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/selector/selector_generic.c
View File

@ -216,6 +216,8 @@ static void sel_s16le(struct processing_module *mod, struct input_stream_buffer
int processed = 0; int processed = 0;
int source_frame_bytes = audio_stream_frame_bytes(source); int source_frame_bytes = audio_stream_frame_bytes(source);
int sink_frame_bytes = audio_stream_frame_bytes(sink); int sink_frame_bytes = audio_stream_frame_bytes(sink);
int n_chan_source = MIN(SEL_SOURCE_CHANNELS_MAX, source->channels);
int n_chan_sink = MIN(SEL_SINK_CHANNELS_MAX, sink->channels);
while (processed < frames) { while (processed < frames) {
n = frames - processed; n = frames - processed;
@ -224,7 +226,7 @@ static void sel_s16le(struct processing_module *mod, struct input_stream_buffer
nmax = audio_stream_bytes_without_wrap(sink, dest) / sink_frame_bytes; nmax = audio_stream_bytes_without_wrap(sink, dest) / sink_frame_bytes;
n = MIN(n, nmax); n = MIN(n, nmax);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
process_frame_s16le(dest, sink->channels, src, source->channels, process_frame_s16le(dest, n_chan_sink, src, n_chan_source,
&cd->coeffs_config); &cd->coeffs_config);
src += source->channels; src += source->channels;
dest += sink->channels; dest += sink->channels;
@ -285,6 +287,8 @@ static void sel_s32le(struct processing_module *mod, struct input_stream_buffer
int processed = 0; int processed = 0;
int source_frame_bytes = audio_stream_frame_bytes(source); int source_frame_bytes = audio_stream_frame_bytes(source);
int sink_frame_bytes = audio_stream_frame_bytes(sink); int sink_frame_bytes = audio_stream_frame_bytes(sink);
int n_chan_source = MIN(SEL_SOURCE_CHANNELS_MAX, source->channels);
int n_chan_sink = MIN(SEL_SINK_CHANNELS_MAX, sink->channels);
while (processed < frames) { while (processed < frames) {
n = frames - processed; n = frames - processed;
@ -293,7 +297,7 @@ static void sel_s32le(struct processing_module *mod, struct input_stream_buffer
nmax = audio_stream_bytes_without_wrap(sink, dest) / sink_frame_bytes; nmax = audio_stream_bytes_without_wrap(sink, dest) / sink_frame_bytes;
n = MIN(n, nmax); n = MIN(n, nmax);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
process_frame_s32le(dest, sink->channels, src, source->channels, process_frame_s32le(dest, n_chan_sink, src, n_chan_source,
&cd->coeffs_config); &cd->coeffs_config);
src += source->channels; src += source->channels;
dest += sink->channels; dest += sink->channels;