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
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
From 022c790aabc300eabad4da8947a3f2bdadce41e1 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 27 May 2019 13:57:12 +0200
|
|
Subject: [PATCH 22/25] pcm_file: coverity fixes (including double locking)
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm_file.c | 16 ++++++----------
|
|
1 file changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
|
|
index 99db3754fa32..54142a3d16ef 100644
|
|
--- a/src/pcm/pcm_file.c
|
|
+++ b/src/pcm/pcm_file.c
|
|
@@ -296,7 +296,10 @@ static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm,
|
|
return -ENOMEM;
|
|
}
|
|
|
|
- bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames));
|
|
+ bytes = snd_pcm_frames_to_bytes(pcm, frames);
|
|
+ if (bytes < 0)
|
|
+ return bytes;
|
|
+ bytes = read(file->ifd, file->rbuf, bytes);
|
|
if (bytes < 0) {
|
|
SYSERR("read from file failed, error: %d", bytes);
|
|
return bytes;
|
|
@@ -589,18 +592,14 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc
|
|
snd_pcm_channel_area_t areas[pcm->channels];
|
|
snd_pcm_sframes_t frames;
|
|
|
|
- __snd_pcm_lock(pcm);
|
|
-
|
|
frames = _snd_pcm_readi(file->gen.slave, buffer, size);
|
|
- if (frames <= 0) {
|
|
- __snd_pcm_unlock(pcm);
|
|
+ if (frames <= 0)
|
|
return frames;
|
|
- }
|
|
|
|
snd_pcm_areas_from_buf(pcm, areas, buffer);
|
|
snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);
|
|
+ __snd_pcm_lock(pcm);
|
|
snd_pcm_file_add_frames(pcm, areas, 0, frames);
|
|
-
|
|
__snd_pcm_unlock(pcm);
|
|
|
|
return frames;
|
|
@@ -654,9 +653,6 @@ static int snd_pcm_file_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t
|
|
snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames)
|
|
{
|
|
snd_pcm_file_t *file = pcm->private_data;
|
|
- snd_pcm_channel_area_t areas_if[pcm->channels];
|
|
- snd_pcm_uframes_t frames_if;
|
|
- void *buffer = NULL;
|
|
int result;
|
|
|
|
result = snd_pcm_mmap_begin(file->gen.slave, areas, offset, frames);
|
|
--
|
|
2.16.4
|
|
|