Takashi Iwai
4f970fe93d
- Remove hackish modprobe install scripts for auto-loading OSS and sequencer modules (bsc#1136562); it's invoked from systemd unit file included in alsa-utils now - Backport upstream fixes: 0001-pcm-direct-Add-generic-hw_ptr_alignment-function-for.patch 0002-pcm-dshare-Added-hw_ptr_alignment-option-in-configur.patch 0003-pcm-dsnoop-Added-hw_ptr_alignment-option-in-configur.patch 0004-pcm-file-add-support-for-infile-reading-in-non-inter.patch 0005-pcm-file-use-snd_pcm_file_areas_read_infile-for-read.patch 0006-pcm-file-add-missing-unlock-on-early-return.patch 0007-ucm-Add-UCM-profile-for-CX2072X-codec-on-Baytrail-Ch.patch 0008-pcm-add-mmap_begin-callback-to-snd_pcm_fast_ops_t-ap.patch 0009-pcm-file-add-infile-read-support-for-mmap-mode.patch 0010-aserver-fix-resource-leak-coverity.patch 0011-src-conf.c-add-missing-va_end-call-coverity.patch 0012-config-parse_string-fix-the-dynamic-buffer-allocatio.patch 0013-control_shm-remove-duplicate-code-coverity.patch 0014-control_shm-add-missing-socket-close-to-the-error-pa.patch 0015-pcm-fix-memory-leak-in-_snd_pcm_parse_config_chmaps-.patch 0016-pcm_file-call-pclose-correctly-for-popen-coverity.patch 0017-pcm_hw-close-file-descriptor-in-the-error-path-in-sn.patch 0018-rawmidi-use-snd_dlobj_cache_get2-in-rawmidi-open-cov.patch 0019-rawmidi_hw-add-sanity-check-for-the-invalid-stream-a.patch 0020-topology-various-coverity-fixes.patch 0021-ucm-coverity-fixes.patch 0022-pcm_file-coverity-fixes-including-double-locking.patch 0023-topology-next-round-of-coverity-fixes.patch 0024-pcm_file-another-locking-fix-coverity.patch 0025-ucm-another-coverity-fix-in-uc_mgr_config_load.patch - Drop the downstream CX2072X UCM profile, which is replaced with OBS-URL: https://build.opensuse.org/request/show/706089 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=253
119 lines
2.6 KiB
Diff
119 lines
2.6 KiB
Diff
From ed156a218644e3334bc452ef2bc948409735c330 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 24 May 2019 21:11:00 +0200
|
|
Subject: [PATCH 21/25] ucm: coverity fixes
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/ucm/parser.c | 18 ++++++++++++++----
|
|
src/ucm/utils.c | 12 +++++++++---
|
|
2 files changed, 23 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
|
index ad6bcec78622..61d5d7f9c47c 100644
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -1114,7 +1114,7 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
|
|
if (err < 0) {
|
|
uc_error("error: %s failed to parse verb",
|
|
file);
|
|
- return err;
|
|
+ goto _err;
|
|
}
|
|
continue;
|
|
}
|
|
@@ -1126,7 +1126,7 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
|
|
if (err < 0) {
|
|
uc_error("error: %s failed to parse device",
|
|
file);
|
|
- return err;
|
|
+ goto _err;
|
|
}
|
|
continue;
|
|
}
|
|
@@ -1138,18 +1138,24 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
|
|
if (err < 0) {
|
|
uc_error("error: %s failed to parse modifier",
|
|
file);
|
|
- return err;
|
|
+ goto _err;
|
|
}
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+ snd_config_delete(cfg);
|
|
+
|
|
/* use case verb must have at least 1 device */
|
|
if (list_empty(&verb->device_list)) {
|
|
uc_error("error: no use case device defined", file);
|
|
return -EINVAL;
|
|
}
|
|
return 0;
|
|
+
|
|
+ _err:
|
|
+ snd_config_delete(cfg);
|
|
+ return err;
|
|
}
|
|
|
|
/*
|
|
@@ -1399,6 +1405,7 @@ next_card:
|
|
|
|
return -1;
|
|
}
|
|
+
|
|
static int load_master_config(const char *card_name, snd_config_t **cfg)
|
|
{
|
|
char filename[MAX_FILE];
|
|
@@ -1610,8 +1617,11 @@ int uc_mgr_scan_master_configs(const char **_list[])
|
|
}
|
|
free(namelist);
|
|
|
|
- if (err >= 0)
|
|
+ if (err >= 0) {
|
|
*_list = list;
|
|
+ } else {
|
|
+ free(list);
|
|
+ }
|
|
|
|
return err;
|
|
}
|
|
diff --git a/src/ucm/utils.c b/src/ucm/utils.c
|
|
index 14227e0aed5b..efd5a97999b1 100644
|
|
--- a/src/ucm/utils.c
|
|
+++ b/src/ucm/utils.c
|
|
@@ -58,14 +58,18 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
|
|
int err;
|
|
|
|
fp = fopen(file, "r");
|
|
- err = fp == NULL ? -errno : snd_input_stdio_attach(&in, fp, 1);
|
|
- if (err < 0) {
|
|
+ if (!fp) {
|
|
+ err = -errno;
|
|
+ __err0:
|
|
uc_error("could not open configuration file %s", file);
|
|
return err;
|
|
}
|
|
+ err = snd_input_stdio_attach(&in, fp, 1);
|
|
+ if (err < 0)
|
|
+ goto __err0;
|
|
err = snd_config_top(&top);
|
|
if (err < 0)
|
|
- return err;
|
|
+ goto __err1;
|
|
|
|
default_path = getenv(ALSA_CONFIG_UCM_VAR);
|
|
if (!default_path || !*default_path)
|
|
@@ -88,6 +92,8 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
|
|
|
|
__err2:
|
|
snd_config_delete(top);
|
|
+ __err1:
|
|
+ snd_input_close(in);
|
|
return err;
|
|
}
|
|
|
|
--
|
|
2.16.4
|
|
|