Takashi Iwai
2d37bad8df
- Backport upstream fixes: yet more PCM plugin fixes, topology fixes/cleanups, UAF fix in UCM (bsc#1181194): 0004-topology-use-inclusive-language-for-bclk.patch 0005-topology-use-inclusive-language-for-fsync.patch 0006-topology-use-inclusive-language-in-documentation.patch 0034-ucm-fix-possible-memory-leak-in-parse_verb_file.patch 0035-topology-tplg_pprint_integer-fix-coverity-uninitaliz.patch 0036-topology-tplg_add_widget_object-do-not-use-invalid-e.patch 0037-topology-tplg_decode_pcm-add-missing-log-argument-co.patch 0038-topology-parse_tuple_set-remove-dead-condition-code.patch 0039-ucm-uc_mgr_substitute_tree-fix-use-after-free.patch 0040-topology-sort_config-cleanups-use-goto-for-the-error.patch 0041-conf-USB-add-Xonar-U7-MKII-to-USB-Audio.pcm.iec958_d.patch 0042-pcm_plugin-set-the-initial-hw_ptr-appl_ptr-from-the-.patch 0043-pcm-dmix-dshare-delay-calculation-fixes-and-cleanups.patch 0044-topology-fix-parse_tuple_set-remove-dead-condition-c.patch OBS-URL: https://build.opensuse.org/request/show/865334 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=292
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From ae7362c996e0b991c399cc26c6d0b3c8e295e83c Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 20 Jan 2021 16:58:33 +0100
|
|
Subject: [PATCH 44/44] topology: fix 'parse_tuple_set() - remove dead
|
|
condition code'
|
|
|
|
The whole SND_SOC_TPLG_TUPLE_TYPE_WORD condition part must be
|
|
commented out, otherwise the condition is always true.
|
|
|
|
Fixes: 51e1d486ce ("topology: parse_tuple_set() - remove dead condition code")
|
|
BugLink: https://github.com/alsa-project/alsa-lib/issues/114
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/data.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/topology/data.c b/src/topology/data.c
|
|
index 5633cdc34dd9..0546d63e478c 100644
|
|
--- a/src/topology/data.c
|
|
+++ b/src/topology/data.c
|
|
@@ -859,11 +859,11 @@ static int parse_tuple_set(snd_config_t *cfg,
|
|
goto err;
|
|
}
|
|
|
|
- if ((type == SND_SOC_TPLG_TUPLE_TYPE_WORD
|
|
- /* && tuple_val > UINT_MAX */)
|
|
- || (type == SND_SOC_TPLG_TUPLE_TYPE_SHORT
|
|
- && tuple_val > USHRT_MAX)
|
|
- || (type == SND_SOC_TPLG_TUPLE_TYPE_BYTE
|
|
+ if (/* (type == SND_SOC_TPLG_TUPLE_TYPE_WORD
|
|
+ && tuple_val > UINT_MAX) || */
|
|
+ (type == SND_SOC_TPLG_TUPLE_TYPE_SHORT
|
|
+ && tuple_val > USHRT_MAX) ||
|
|
+ (type == SND_SOC_TPLG_TUPLE_TYPE_BYTE
|
|
&& tuple_val > UCHAR_MAX)) {
|
|
SNDERR("tuple %s: invalid value", id);
|
|
goto err;
|
|
--
|
|
2.26.2
|
|
|