6117f9abfc
- Backport upstream fixes (bsc#1012594):
- A few PCM bugs have been fixed:
* Stall of dmix and others in a wrong PCM state
* Refactoring of PCM locking scheme
* SHM initialization race fix
* plug PCM memory leaks
* Improvement of dshare/dmix delay calculation
* Fix endless dshare draining
* Fix semaphore discard race fix of direct plugins
- UCM fixes and updates for DB410c and skylake-r5286
- Mixer code cleanup not to install bogus plugin codes
- Documentation fixes / updates
0001-ucm-Add-ucm-files-for-DB410c-board.patch
0002-mixer-Fix-rounding-mode-documentation.patch
0003-pcm-Fix-shm-initialization-race-condition.patch
0004-pcm-Better-understandable-locking-code.patch
0005-ucm-fix-crash-when-calling-snd_use_case_geti-with-no.patch
0006-ucm-docs-typeset-lists-of-identifiers-explicitly.patch
0007-Update-include-sound-tlv.h-from-4.9-pre-kernel-uapi.patch
0008-test-use-actual-information-for-TLV-operation.patch
0009-ctl-improve-API-documentation-for-TLV-operation.patch
0010-ctl-improve-documentation-about-TLV-related-APIs.patch
0011-ctl-correct-documentation-about-TLV-feature.patch
0012-conf-ucm-skylake-add-skylake-rt286-conf-files.patch
0013-pcm_plug-Clear-plugins-on-all-error-conditions.patch
0014-mixer-Don-t-install-smixer-modules-unless-python-is-.patch
0015-pcm_dshare-Do-not-discard-slave-reported-delay-in-st.patch
0016-pcm-direct-Protect-from-freeing-semaphore-when-alrea.patch
0017-pcm-dshare-Fix-endless-playback-of-buffer.patch
0018-pcm-Add-the-PCM-state-checks-to-plugins.patch
OBS-URL: https://build.opensuse.org/request/show/442719
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=202
83 lines
3.1 KiB
Diff
83 lines
3.1 KiB
Diff
From 2dd78251ff0c4009b478574cca7aef2eb05c2279 Mon Sep 17 00:00:00 2001
|
|
From: Joshua Frkuska <joshua_frkuska@mentor.com>
|
|
Date: Fri, 25 Nov 2016 15:43:40 +0530
|
|
Subject: [PATCH] pcm: direct: Protect from freeing semaphore when already in
|
|
use
|
|
|
|
In the case of dshare, dsnoop, and dmix when a device is opened twice
|
|
and fails the second time, the semaphore is completely discarded. This
|
|
creates dangling semaphore data.
|
|
|
|
This patch removes the possibility for the semaphore to be destroyed during
|
|
a typical open failure by first checking if the shared memory can be destroyed
|
|
or not. If the shared memory cannot be released it means both it and the
|
|
semaphore are still in use and therefore the semaphore is just released.
|
|
|
|
Signed-off-by: Joshua Frkuska <joshua_frkuska@mentor.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_dmix.c | 7 ++++---
|
|
src/pcm/pcm_dshare.c | 7 ++++---
|
|
src/pcm/pcm_dsnoop.c | 8 +++++---
|
|
3 files changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
|
|
index 2714fb93c758..2fedb1c14a3b 100644
|
|
--- a/src/pcm/pcm_dmix.c
|
|
+++ b/src/pcm/pcm_dmix.c
|
|
@@ -1154,9 +1154,10 @@ int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
|
|
snd_pcm_close(spcm);
|
|
if (dmix->u.dmix.shmid_sum >= 0)
|
|
shm_sum_discard(dmix);
|
|
- if (dmix->shmid >= 0)
|
|
- snd_pcm_direct_shm_discard(dmix);
|
|
- if (snd_pcm_direct_semaphore_discard(dmix) < 0)
|
|
+ if ((dmix->shmid >= 0) && (snd_pcm_direct_shm_discard(dmix))) {
|
|
+ if (snd_pcm_direct_semaphore_discard(dmix))
|
|
+ snd_pcm_direct_semaphore_final(dmix, DIRECT_IPC_SEM_CLIENT);
|
|
+ } else
|
|
snd_pcm_direct_semaphore_up(dmix, DIRECT_IPC_SEM_CLIENT);
|
|
_err_nosem:
|
|
if (dmix) {
|
|
diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
|
|
index 9b478a714468..01f5eed8f97a 100644
|
|
--- a/src/pcm/pcm_dshare.c
|
|
+++ b/src/pcm/pcm_dshare.c
|
|
@@ -846,9 +846,10 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
|
|
snd_pcm_direct_client_discard(dshare);
|
|
if (spcm)
|
|
snd_pcm_close(spcm);
|
|
- if (dshare->shmid >= 0)
|
|
- snd_pcm_direct_shm_discard(dshare);
|
|
- if (snd_pcm_direct_semaphore_discard(dshare) < 0)
|
|
+ if ((dshare->shmid >= 0) && (snd_pcm_direct_shm_discard(dshare))) {
|
|
+ if (snd_pcm_direct_semaphore_discard(dshare))
|
|
+ snd_pcm_direct_semaphore_final(dshare, DIRECT_IPC_SEM_CLIENT);
|
|
+ } else
|
|
snd_pcm_direct_semaphore_up(dshare, DIRECT_IPC_SEM_CLIENT);
|
|
_err_nosem:
|
|
if (dshare) {
|
|
diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
|
|
index 4efbc53d177e..1aedf3cb73d2 100644
|
|
--- a/src/pcm/pcm_dsnoop.c
|
|
+++ b/src/pcm/pcm_dsnoop.c
|
|
@@ -719,10 +719,12 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
|
|
snd_pcm_direct_client_discard(dsnoop);
|
|
if (spcm)
|
|
snd_pcm_close(spcm);
|
|
- if (dsnoop->shmid >= 0)
|
|
- snd_pcm_direct_shm_discard(dsnoop);
|
|
- if (snd_pcm_direct_semaphore_discard(dsnoop) < 0)
|
|
+ if ((dsnoop->shmid >= 0) && (snd_pcm_direct_shm_discard(dsnoop))) {
|
|
+ if (snd_pcm_direct_semaphore_discard(dsnoop))
|
|
+ snd_pcm_direct_semaphore_final(dsnoop, DIRECT_IPC_SEM_CLIENT);
|
|
+ } else
|
|
snd_pcm_direct_semaphore_up(dsnoop, DIRECT_IPC_SEM_CLIENT);
|
|
+
|
|
_err_nosem:
|
|
if (dsnoop) {
|
|
free(dsnoop->bindings);
|
|
--
|
|
2.10.2
|
|
|