From: Mark Hills <mark@xwax.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH 2/3] echoaudio: Prevent races in calls to set_audio_format()
Date: Tue, 16 Jun 2020 14:17:42 +0100 [thread overview]
Message-ID: <20200616131743.4793-2-mark@xwax.org> (raw)
In-Reply-To: <2006161409060.30751@stax.localdomain>
The function uses chip->comm_page which needs locking against
other use at the same time.
Signed-off-by: Mark Hills <mark@xwax.org>
---
sound/pci/echoaudio/echoaudio.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 82a49dfd2384..8cf08988959f 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -711,9 +711,22 @@ static int pcm_prepare(struct snd_pcm_substream *substream)
if (snd_BUG_ON(pipe_index >= px_num(chip)))
return -EINVAL;
- if (snd_BUG_ON(!is_pipe_allocated(chip, pipe_index)))
+
+ /*
+ * We passed checks we can do independently; now take
+ * exclusive control
+ */
+
+ spin_lock(&chip->lock);
+
+ if (snd_BUG_ON(!is_pipe_allocated(chip, pipe_index))) {
+ spin_unlock(&chip->lock);
return -EINVAL;
+ }
+
set_audio_format(chip, pipe_index, &format);
+ spin_unlock(&chip->lock);
+
return 0;
}
--
2.17.5
next prev parent reply other threads:[~2020-06-16 13:20 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 13:13 echoaudio: Fix some long standing bugs Mark Hills
2020-06-16 13:17 ` [PATCH 1/3] echoaudio: Race conditions around "opencount" Mark Hills
2020-06-16 13:17 ` Mark Hills [this message]
2020-06-16 13:24 ` [PATCH 2/3] echoaudio: Prevent races in calls to set_audio_format() Takashi Iwai
2020-06-16 13:17 ` [PATCH 3/3] echoaudio: Address bugs in the interrupt handling Mark Hills
2020-06-16 13:35 ` Takashi Iwai
2020-06-16 14:01 ` Mark Hills
2020-06-16 14:18 ` Takashi Iwai
2020-06-17 10:51 ` Mark Hills
2020-06-18 8:17 ` Takashi Iwai
2020-06-18 11:07 ` Mark Hills
2020-06-18 11:21 ` Takashi Iwai
2020-06-18 12:29 ` Mark Hills
2020-06-18 13:22 ` Mark Hills
2020-06-16 19:46 ` Giuliano Pochini
2020-06-17 10:57 ` Mark Hills
2020-06-16 22:01 ` Giuliano Pochini
2020-06-17 11:14 ` Mark Hills
2020-06-19 19:56 ` Giuliano Pochini
2020-06-19 21:21 ` Mark Hills
2020-06-28 22:02 ` Giuliano Pochini
2020-07-01 12:25 ` Mark Hills
2020-07-01 14:51 ` Giuliano Pochini
2020-07-01 12:25 ` echoaudio: Fix some long standing bugs Mark Hills
2020-07-01 12:27 ` [PATCH 1/4] echoaudio: Race conditions around "opencount" Mark Hills
2020-07-01 16:37 ` kernel test robot
2020-07-01 17:32 ` kernel test robot
2020-07-02 9:53 ` Mark Hills
2020-07-07 8:28 ` Takashi Iwai
2020-07-08 10:16 ` Mark Hills
2020-07-08 10:18 ` [PATCH 1/5] echoaudio: Remove redundant check Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 2/5] echoaudio: Race conditions around "opencount" Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 3/5] echoaudio: Prevent races in calls to set_audio_format() Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 4/5] echoaudio: Prevent some noise on unloading the module Mark Hills
2020-07-09 11:00 ` Takashi Iwai
2020-07-08 10:18 ` [PATCH 5/5] echoaudio: Address bugs in the interrupt handling Mark Hills
2020-07-09 11:01 ` Takashi Iwai
2020-07-01 12:27 ` [PATCH 2/4] echoaudio: Prevent races in calls to set_audio_format() Mark Hills
2020-07-01 12:27 ` [PATCH 3/4] echoaudio: Prevent some noise on unloading the module Mark Hills
2020-07-01 12:27 ` [PATCH 4/4] echoaudio: Address bugs in the interrupt handling Mark Hills
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200616131743.4793-2-mark@xwax.org \
--to=mark@xwax.org \
--cc=alsa-devel@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).