rpms/alsa-lib
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add coverity fixes

Browse Source
This commit is contained in:
Jaroslav Kysela 2021-06-02 20:02:15 +02:00
parent c9814e5a0f
commit 7eb4b59807
1 changed files with 530 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

533
alsa-git.patch
View File

@ -1,7 +1,7 @@
From ddfc32abf5697de1618b9e7ffdf57a0f97013090 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 08:49:32 +0200
Subject: [PATCH 1/3] conf: fix load_for_all_cards()
Subject: [PATCH 01/18] conf: fix load_for_all_cards()
The 63f7745b commit is loading the driver specific configuration
multiple times which ends with the array merges (see the bug).
@ -99,7 +99,7 @@ index f6c80031..d863dec6 100644
From 0e4ba2ea8c0402f12a645032a14693eb9b1278e6 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 11:09:43 +0200
Subject: [PATCH 2/3] ucm: add _alibpref to get the private device prefix
Subject: [PATCH 02/18] ucm: add _alibpref to get the private device prefix
It may be useful to get the device prefix for the local configuration.
@ -168,7 +168,8 @@ index 361952f6..3c9ea15d 100644
From 9621d0bff2e60b43e329ffa5059ab19f2914ec14 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 11:21:54 +0200
Subject: [PATCH 3/3] ucm: fix _alibpref string (add '.' delimiter to the end)
Subject: [PATCH 03/18] ucm: fix _alibpref string (add '.' delimiter to the
end)
Fixes: 0e4ba2ea ("ucm: add _alibpref to get the private device prefix")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
@ -199,3 +200,529 @@ index 3c9ea15d..c9b37b68 100644
--
2.30.2
From 2a1dafdbe5932260aeb4db359ce5d630b8106889 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:26:47 +0200
Subject: [PATCH 04/18] conf: remove dead code in snd_config_get_card()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/confmisc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/confmisc.c b/src/confmisc.c
index 3663d164..a561040c 100644
--- a/src/confmisc.c
+++ b/src/confmisc.c
@@ -154,10 +154,10 @@ int snd_config_get_card(const snd_config_t *conf)
long v;
int err;
- if ((err = snd_config_get_integer(conf, &v)) < 0) {
+ if (snd_config_get_integer(conf, &v) < 0) {
if ((err = snd_config_get_string(conf, &str)) < 0) {
- snd_config_get_id(conf, &id);
- SNDERR("Invalid field %s", id);
+ if (snd_config_get_id(conf, &id) >= 0)
+ SNDERR("Invalid field %s", id);
return -EINVAL;
}
err = snd_card_get_index(str);
--
2.30.2
From 013ec607db9de11b682f2b85d843be062ca0d046 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:28:32 +0200
Subject: [PATCH 05/18] control: remap - fix uninitialized value in
parse_map_vindex()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/control/control_remap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/control/control_remap.c b/src/control/control_remap.c
index f3d65010..17c6558a 100644
--- a/src/control/control_remap.c
+++ b/src/control/control_remap.c
@@ -1040,7 +1040,7 @@ static int parse_map_vindex(struct snd_ctl_map_ctl *mctl, snd_config_t *conf)
snd_config_for_each(i, next, conf) {
snd_config_t *n = snd_config_iterator_entry(i);
- long idx, chn;
+ long idx = -1, chn = -1;
const char *id;
if (snd_config_get_id(n, &id) < 0)
continue;
--
2.30.2
From 2fee6af9b6e157475159d284af8de1e879bb7a36 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:35:44 +0200
Subject: [PATCH 06/18] pcm: direct - fix pcmp error path in
_snd_pcm_direct_new()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/pcm/pcm_direct.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index 0e5e0421..361805bd 100644
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -2126,24 +2126,20 @@ int _snd_pcm_direct_new(snd_pcm_t **pcmp, snd_pcm_direct_t **_dmix, int type,
dmix->type = type;
ret = snd_pcm_new(pcmp, type, name, stream, mode);
- if (ret < 0) {
-_err_nosem:
- free(dmix->bindings);
- free(dmix);
- return ret;
- }
+ if (ret < 0)
+ goto _err_nosem;
while (1) {
ret = snd_pcm_direct_semaphore_create_or_connect(dmix);
if (ret < 0) {
SNDERR("unable to create IPC semaphore");
- goto _err_nosem;
+ goto _err_nosem_free;
}
ret = snd_pcm_direct_semaphore_down(dmix, DIRECT_IPC_SEM_CLIENT);
if (ret < 0) {
snd_pcm_direct_semaphore_discard(dmix);
if (--fail_sem_loop <= 0)
- goto _err_nosem;
+ goto _err_nosem_free;
continue;
}
break;
@@ -2153,10 +2149,17 @@ _err_nosem:
if (ret < 0) {
SNDERR("unable to create IPC shm instance");
snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT);
- goto _err_nosem;
+ goto _err_nosem_free;
} else {
*_dmix = dmix;
}
+ return ret;
+_err_nosem_free:
+ snd_pcm_free(*pcmp);
+ *pcmp = NULL;
+_err_nosem:
+ free(dmix->bindings);
+ free(dmix);
return ret;
}
--
2.30.2
From eb95cad4e22a0bf2577f1fa4a3f6fd18caed3362 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:37:53 +0200
Subject: [PATCH 07/18] pcm: remove extra NULL checks in snd_pcm_dmix_open()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/pcm/pcm_dmix.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index 8747450f..608593f1 100644
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -998,7 +998,7 @@ int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
snd_config_t *root, snd_config_t *sconf,
snd_pcm_stream_t stream, int mode)
{
- snd_pcm_t *pcm = NULL, *spcm = NULL;
+ snd_pcm_t *pcm, *spcm = NULL;
snd_pcm_direct_t *dmix;
int ret, first_instance;
@@ -1154,12 +1154,9 @@ int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
} else
snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT);
_err_nosem:
- if (dmix) {
- free(dmix->bindings);
- free(dmix);
- }
- if (pcm)
- snd_pcm_free(pcm);
+ free(dmix->bindings);
+ free(dmix);
+ snd_pcm_free(pcm);
return ret;
}
--
2.30.2
From 01a45aec6fcd5a5378a5b5e0ae0f9dacde2068e4 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:39:32 +0200
Subject: [PATCH 08/18] pcm: remove extra NULL checks in snd_pcm_dsnoop_open()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/pcm/pcm_dsnoop.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index fb1b02c2..2c3b9f43 100644
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -564,8 +564,8 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
snd_config_t *root, snd_config_t *sconf,
snd_pcm_stream_t stream, int mode)
{
- snd_pcm_t *pcm = NULL, *spcm = NULL;
- snd_pcm_direct_t *dsnoop = NULL;
+ snd_pcm_t *pcm, *spcm = NULL;
+ snd_pcm_direct_t *dsnoop;
int ret, first_instance;
assert(pcmp);
@@ -708,12 +708,9 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
snd_pcm_direct_semaphore_up(dsnoop, DIRECT_IPC_SEM_CLIENT);
_err_nosem:
- if (dsnoop) {
- free(dsnoop->bindings);
- free(dsnoop);
- }
- if (pcm)
- snd_pcm_free(pcm);
+ free(dsnoop->bindings);
+ free(dsnoop);
+ snd_pcm_free(pcm);
return ret;
}
--
2.30.2
From 74c6382df6cf18b801659d8c5c53407a7ea1f02b Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:46:46 +0200
Subject: [PATCH 09/18] pcm: remove extra NULL checks in snd_pcm_dshare_open()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/pcm/pcm_dshare.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index 0f5238a6..a918512b 100644
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -690,8 +690,8 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
snd_config_t *root, snd_config_t *sconf,
snd_pcm_stream_t stream, int mode)
{
- snd_pcm_t *pcm = NULL, *spcm = NULL;
- snd_pcm_direct_t *dshare = NULL;
+ snd_pcm_t *pcm, *spcm = NULL;
+ snd_pcm_direct_t *dshare;
int ret, first_instance;
unsigned int chn;
@@ -851,12 +851,9 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
} else
snd_pcm_direct_semaphore_up(dshare, DIRECT_IPC_SEM_CLIENT);
_err_nosem:
- if (dshare) {
- free(dshare->bindings);
- free(dshare);
- }
- if (pcm)
- snd_pcm_free(pcm);
+ free(dshare->bindings);
+ free(dshare);
+ snd_pcm_free(pcm);
return ret;
}
--
2.30.2
From eabadf545c51d4c88c5f359db73726ec3ac653ba Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:49:29 +0200
Subject: [PATCH 10/18] pcm: softvol - fix early exit in add_tlv_info()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/pcm/pcm_softvol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index e2bdd31a..eea322ca 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -711,13 +711,13 @@ static int add_tlv_info(snd_pcm_softvol_t *svol, snd_ctl_elem_info_t *cinfo,
unsigned int *old_tlv, size_t old_tlv_size)
{
unsigned int tlv[4];
- if (sizeof(tlv) <= old_tlv_size && memcmp(tlv, old_tlv, sizeof(tlv)) == 0)
- return 0;
tlv[SNDRV_CTL_TLVO_TYPE] = SND_CTL_TLVT_DB_SCALE;
tlv[SNDRV_CTL_TLVO_LEN] = 2 * sizeof(int);
tlv[SNDRV_CTL_TLVO_DB_SCALE_MIN] = (int)(svol->min_dB * 100);
tlv[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] =
(int)((svol->max_dB - svol->min_dB) * 100 / svol->max_val);
+ if (sizeof(tlv) <= old_tlv_size && memcmp(tlv, old_tlv, sizeof(tlv)) == 0)
+ return 0;
return snd_ctl_elem_tlv_write(svol->ctl, &cinfo->id, tlv);
}
--
2.30.2
From cf3846d46053b23006e6a9042b586fc78e81af55 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:50:17 +0200
Subject: [PATCH 11/18] timer: remove dead code in _snd_timer_hw_open()
---
src/timer/timer_hw.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/timer/timer_hw.c b/src/timer/timer_hw.c
index cfb77463..fe4e40bb 100644
--- a/src/timer/timer_hw.c
+++ b/src/timer/timer_hw.c
@@ -330,8 +330,6 @@ int _snd_timer_hw_open(snd_timer_t **timer, char *name,
SNDERR("Unexpected field %s", id);
return -EINVAL;
}
- if (card < 0)
- return -EINVAL;
return snd_timer_hw_open(timer, name, dev_class, dev_sclass, card, device, subdevice, mode);
}
SND_DLSYM_BUILD_VERSION(_snd_timer_hw_open, SND_TIMER_DLSYM_VERSION);
--
2.30.2
From 200d18cda7a700607c21ad5dc9faaea2a1e27dbd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:51:13 +0200
Subject: [PATCH 12/18] ucm: fix error path in execute_cfgsave()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/ucm/main.c b/src/ucm/main.c
index c9b37b68..42fdaa1d 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -605,8 +605,10 @@ static int execute_cfgsave(snd_use_case_mgr_t *uc_mgr, const char *filename)
uc_error("unable to open file '%s': %s", file, snd_strerror(err));
goto _err;
}
- if (!config || snd_config_is_empty(config))
+ if (!config || snd_config_is_empty(config)) {
+ snd_output_close(out);
goto _err;
+ }
if (with_root) {
snd_output_printf(out, "%s ", root);
err = _snd_config_save_node_value(config, out, 0);
--
2.30.2
From 9b71d53bde21c8bb0d900c17863664e12753d844 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:52:12 +0200
Subject: [PATCH 13/18] ucm: fix use after free in if_eval_regex_match()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_cond.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/ucm/ucm_cond.c b/src/ucm/ucm_cond.c
index 59d1a155..adb0ecd9 100644
--- a/src/ucm/ucm_cond.c
+++ b/src/ucm/ucm_cond.c
@@ -160,11 +160,12 @@ static int if_eval_regex_match(snd_use_case_mgr_t *uc_mgr, snd_config_t *eval)
if (err < 0)
return err;
err = regcomp(&re, s, options);
- free(s);
if (err) {
uc_error("Regex '%s' compilation failed (code %d)", s, err);
+ free(s);
return -EINVAL;
}
+ free(s);
err = uc_mgr_get_substituted_value(uc_mgr, &s, string);
if (err < 0) {
--
2.30.2
From 7764e3e621a4c8a52327833d44e32c8b6fe3a131 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:53:24 +0200
Subject: [PATCH 14/18] ucm: fix if_eval_path() - access NULL pointer
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_cond.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ucm/ucm_cond.c b/src/ucm/ucm_cond.c
index adb0ecd9..0ed0b690 100644
--- a/src/ucm/ucm_cond.c
+++ b/src/ucm/ucm_cond.c
@@ -272,7 +272,7 @@ static int if_eval_control_exists(snd_use_case_mgr_t *uc_mgr, snd_config_t *eval
static int if_eval_path(snd_use_case_mgr_t *uc_mgr, snd_config_t *eval)
{
- const char *path, *mode = NULL;
+ const char *path, *mode = "";
int err, amode = F_OK;
if (uc_mgr->conf_format < 4) {
--
2.30.2
From 7fcb1aadd56e94f03e51c4747e72d77279151c22 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:56:01 +0200
Subject: [PATCH 15/18] ucm: find_exec() - fix memory leak (dir)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_exec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
index a22df8fe..1cdb2633 100644
--- a/src/ucm/ucm_exec.c
+++ b/src/ucm/ucm_exec.c
@@ -73,6 +73,7 @@ static int find_exec(const char *name, char *out, size_t len)
|| !(st.st_mode & S_IEXEC))
continue;
snd_strlcpy(out, bin, len);
+ closedir(dir);
return 1;
}
closedir(dir);
--
2.30.2
From 26ab7fc3e4cba416cf51aa0fb48fdddaa0d861ee Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:58:04 +0200
Subject: [PATCH 16/18] ucm: fix possible NULL pointer dereference in
uc_mgr_exec()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_exec.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
index 1cdb2633..d83206d0 100644
--- a/src/ucm/ucm_exec.c
+++ b/src/ucm/ucm_exec.c
@@ -185,7 +185,11 @@ int uc_mgr_exec(const char *prog)
return -EINVAL;
prog = argv[0];
- if (argv[0][0] != '/' && argv[0][0] != '.') {
+ if (prog == NULL) {
+ err = -EINVAL;
+ goto __error;
+ }
+ if (prog[0] != '/' && prog[0] != '.') {
if (!find_exec(argv[0], bin, sizeof(bin))) {
err = -ENOEXEC;
goto __error;
--
2.30.2
From 64a6d4d1e827732bef7c68e1e6d2cb6863b4597c Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 19:59:10 +0200
Subject: [PATCH 17/18] ucm: check error value in parse_lookup_query()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_subs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
index c56730c5..0bc4e63f 100644
--- a/src/ucm/ucm_subs.c
+++ b/src/ucm/ucm_subs.c
@@ -224,7 +224,11 @@ static snd_config_t *parse_lookup_query(const char *query)
uc_error("unable to create memory input buffer");
return NULL;
}
- snd_config_top(&config);
+ err = snd_config_top(&config);
+ if (err < 0) {
+ snd_input_close(input);
+ return NULL;
+ }
err = snd_config_load(config, input);
snd_input_close(input);
if (err < 0) {
--
2.30.2
From 30d1d256e792fbabf14c57efb98c489541b19f37 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Jun 2021 20:01:08 +0200
Subject: [PATCH 18/18] ucm: fix out-of-array access in
rval_device_lookup_init()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/ucm/ucm_subs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
index 0bc4e63f..20905c3f 100644
--- a/src/ucm/ucm_subs.c
+++ b/src/ucm/ucm_subs.c
@@ -489,7 +489,7 @@ static int rval_device_lookup_init(snd_use_case_mgr_t *uc_mgr,
uc_error("Missing device type!");
return -EINVAL;
}
- for (t = types; t; t++)
+ for (t = types; t->name; t++)
if (strcasecmp(t->name, s) == 0)
return t->init(iter, config);
uc_error("Device type '%s' is invalid", s);
--
2.30.2