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
71 lines
1.7 KiB
Diff
71 lines
1.7 KiB
Diff
From c6e7fd8b1e0d8729c7220734ca0b529c35d926ed Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 27 May 2019 14:05:12 +0200
|
|
Subject: [PATCH 23/25] topology: next round of coverity fixes
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/data.c | 5 ++---
|
|
src/topology/parser.c | 7 +++++--
|
|
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/topology/data.c b/src/topology/data.c
|
|
index aa2b87e73f50..b3f4421f5d5c 100644
|
|
--- a/src/topology/data.c
|
|
+++ b/src/topology/data.c
|
|
@@ -88,8 +88,7 @@ static int tplg_parse_data_file(snd_config_t *cfg, struct tplg_elem *elem)
|
|
if (fp == NULL) {
|
|
SNDERR("error: invalid data file path '%s'\n",
|
|
filename);
|
|
- ret = -errno;
|
|
- goto err;
|
|
+ return -errno;
|
|
}
|
|
|
|
fseek(fp, 0L, SEEK_END);
|
|
@@ -463,6 +462,7 @@ static int copy_tuples(struct tplg_elem *elem,
|
|
|
|
off = priv->size;
|
|
priv->size = size; /* update private data size */
|
|
+ elem->data = priv;
|
|
|
|
array = (struct snd_soc_tplg_vendor_array *)(priv->data + off);
|
|
array->size = set_size;
|
|
@@ -499,7 +499,6 @@ static int copy_tuples(struct tplg_elem *elem,
|
|
}
|
|
}
|
|
|
|
- elem->data = priv;
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/src/topology/parser.c b/src/topology/parser.c
|
|
index a7cff1c30edc..5940692da2e2 100644
|
|
--- a/src/topology/parser.c
|
|
+++ b/src/topology/parser.c
|
|
@@ -253,8 +253,10 @@ static int tplg_load_config(const char *file, snd_config_t **cfg)
|
|
}
|
|
|
|
ret = snd_input_close(in);
|
|
- if (ret < 0)
|
|
+ if (ret < 0) {
|
|
+ in = NULL;
|
|
goto err_load;
|
|
+ }
|
|
|
|
*cfg = top;
|
|
return 0;
|
|
@@ -262,7 +264,8 @@ static int tplg_load_config(const char *file, snd_config_t **cfg)
|
|
err_load:
|
|
snd_config_delete(top);
|
|
err:
|
|
- snd_input_close(in);
|
|
+ if (in)
|
|
+ snd_input_close(in);
|
|
return ret;
|
|
}
|
|
|
|
--
|
|
2.16.4
|
|
|