Takashi Iwai
4f7fd72c0e
- Backport upstream fixes: 0001-ucm-substitution-remove-duplicate-allow_empty-assign.patch 0002-ucm-fix-parse_get_safe_name-safe-name-must-be-checke.patch 0003-ucm-substitute-the-merged-tree-completely.patch 0004-ctl-improve-documentation-for-identifier-of-control-.patch 0005-pcm-dmix-make-lockless-operation-optional.patch 0006-pcm-dmix-Fix-semaphore-usage-with-lockless-operation.patch 0007-pcm-iec958-implement-HDMI-HBR-audio-formatting.patch 0008-pcm-iec958-set-channel-status-bits-according-to-rate.patch 0009-conf-pcm-USB-Added-S-PDIF-fix-for-Asus-Xonar-SE.patch 0010-control-ctlparse-fix-enum-values-in-or.patch 0011-conf-USB-Audio-Disable-IEC958-on-Lenovo-ThinkStation.patch 0012-pcm-dmix-fix-access-to-sum-buffer-in-non-interleaved.patch 0014-control-Add-documentation-for-snd_ctl_elem_list_.patch 0015-conf-quote-also-strings-with-and-characters-in-strin.patch 0016-topology-decode-Fix-channel-map-memory-allocation.patch 0017-topology-decode-Fix-infinite-loop-in-decoding-enum-c.patch 0018-topology-decode-Remove-decoding-values-for-enum-cont.patch 0019-topology-decode-Add-enum-control-texts-as-separate-e.patch 0020-topology-decode-Fix-printing-texts-section.patch 0021-topology-decode-Change-declaration-of-enum-decoding-.patch 0022-topology-decode-Fix-decoding-PCM-formats-and-rates.patch 0023-topology-decode-Print-sig_bits-field-in-PCM-capabili.patch 0024-topology-decode-Add-DAI-name-printing.patch 0025-topology-Make-buffer-for-saving-dynamic-size.patch 0026-topology-return-correct-value-in-tplg_save_printf.patch 0027-topology-fix-some-gcc10-warnings-labs-signess.patch 0028-topology-fix-sort_config.patch 0029-topology-fix-the-unaligned-access.patch 0030-topology-improve-the-printf-buffer-management.patch OBS-URL: https://build.opensuse.org/request/show/836375 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=281
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 1ac965184eaefe503939e454273223a1d8d32f41 Mon Sep 17 00:00:00 2001
|
|
From: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
|
|
Date: Mon, 31 Aug 2020 11:08:54 +0200
|
|
Subject: [PATCH 16/32] topology: decode: Fix channel map memory allocation
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Memory allocated on the stack was referenced outside of the function scope
|
|
caused undefined behaviour.
|
|
|
|
Signed-off-by: Piotr Maziarz <piotrx.maziarz@linux.intel.com>
|
|
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
|
|
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
|
|
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/ctl.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/topology/ctl.c b/src/topology/ctl.c
|
|
index 90241b6318c5..6e6c1d163aa3 100644
|
|
--- a/src/topology/ctl.c
|
|
+++ b/src/topology/ctl.c
|
|
@@ -1330,7 +1330,6 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg,
|
|
void *bin, size_t size)
|
|
{
|
|
struct snd_soc_tplg_enum_control *ec = bin;
|
|
- struct snd_tplg_channel_map_template cmt;
|
|
int i;
|
|
|
|
if (size < sizeof(*ec)) {
|
|
@@ -1375,11 +1374,13 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg,
|
|
}
|
|
}
|
|
|
|
- et->map = &cmt;
|
|
- memset(&cmt, 0, sizeof(cmt));
|
|
- cmt.num_channels = ec->num_channels;
|
|
- for (i = 0; i < cmt.num_channels; i++) {
|
|
- struct snd_tplg_channel_elem *channel = &cmt.channel[i];
|
|
+ et->map = tplg_calloc(heap, sizeof(struct snd_tplg_channel_map_template));
|
|
+ if (!et->map)
|
|
+ return -ENOMEM;
|
|
+ et->map->num_channels = ec->num_channels;
|
|
+ for (i = 0; i < et->map->num_channels; i++) {
|
|
+ struct snd_tplg_channel_elem *channel = &et->map->channel[i];
|
|
+
|
|
tplg_log(tplg, 'D', pos + ((void *)&ec->channel[i] - (void *)ec),
|
|
"enum: channel size %d", ec->channel[i].size);
|
|
channel->reg = ec->channel[i].reg;
|
|
--
|
|
2.16.4
|
|
|