| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <s5hlitqe0ur.wl%tiwai@suse.de>
Date: Thu, 15 Sep 2011 09:11:40 +0200
From: Takashi Iwai <tiwai@...e.de>
To: Arjan van de Ven <arjan@...radead.org>
Cc: alsa-devel@...a-project.org, akpm@...ux-foundation.org,
linux-kernel@...r.kernel.org
Subject: Re: [alsa-devel] [PATCH] sound: Fix race condition in the pcm_lib "wait for space loop
At Mon, 12 Sep 2011 11:57:31 +0200,
Takashi Iwai wrote:
>
> Hi,
>
> sorry for the late follow-up, as I've been on vacation until today.
>
> At Mon, 5 Sep 2011 09:49:47 -0700,
> Arjan van de Ven wrote:
> >
> > >From 2e37f0a4b2289962e1a45d8e02f8a7f7adad619f Mon Sep 17 00:00:00 2001
> > From: Arjan van de Ven <arjan@...ux.intel.com>
> > Date: Mon, 5 Sep 2011 09:40:18 -0700
> > Subject: [PATCH] sound: Fix race condition in the pcm_lib "wait for space" loop
> >
> > The wait_for_avail() function in pcm_lib.c has a race in it (observed in
> > practice by an Intel validation group).
> >
> > The function is supposed to return once space in the buffer has become
> > available, or if some timeout happens. The entity that creates space (irq
> > handler of sound driver and some such) will do a wake up on a waitqueue that
> > this function registers for.
> >
> > However there are two races in the existing code
> > 1) If space became available between the caller noticing there was no space and
> > this function actually sleeping, the wakeup is missed and the timeout
> > condition will happen instead
> > 2) If a wakeup happened but not sufficient space became available, the code will loop
> > again and wait for more space. However, if the second wake comes in prior
> > to hitting the schedule_timeout_interruptible(), it will be missed, and
> > potentially you'll wait out until the timeout happens.
> >
> > The fix consists of using more careful setting of the current state (so that
> > if a wakeup happens in the main loop window, the schedule_timeout() falls
> > through) and by checking for available space prior to going into the
> > schedule_timeout() loop, but after being on the waitqueue and having the
> > state set to interruptible.
> >
> > Signed-off-by: Arjan van de Ven <arjan@...ux.intel.com>
> > CC: Jaroslav Kysela <perex@...ex.cz>
> > CC: Takashi Iwai <tiwai@...e.de>
> > CC: alsa-devel@...a-project.org
> > CC: linux-kernel@...r.kernel.org
> > ---
> > sound/core/pcm_lib.c | 29 ++++++++++++++++++++++++++---
> > 1 files changed, 26 insertions(+), 3 deletions(-)
> >
> > diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
> > index 86d0caf..8848080 100644
> > --- a/sound/core/pcm_lib.c
> > +++ b/sound/core/pcm_lib.c
> > @@ -1761,6 +1761,10 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
> > snd_pcm_uframes_t avail = 0;
> > long wait_time, tout;
> >
> > + init_waitqueue_entry(&wait, current);
> > + add_wait_queue(&runtime->tsleep, &wait);
> > + set_current_state(TASK_INTERRUPTIBLE);
> > +
> > if (runtime->no_period_wakeup)
> > wait_time = MAX_SCHEDULE_TIMEOUT;
> > else {
> > @@ -1771,16 +1775,34 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
> > }
> > wait_time = msecs_to_jiffies(wait_time * 1000);
> > }
> > - init_waitqueue_entry(&wait, current);
> > - add_wait_queue(&runtime->tsleep, &wait);
> > +
> > + /*
> > + * We need to check if space became available already (and thus the
> > + * wakeup happened already) prior to going into the sleep loop to
> > + * close the race of space already having become available.
> > + * This check must happen after been added to the waitqueue and
> > + * having current state be INTERRUPTIBLE.
> > + */
> > +
> > + if (is_playback)
> > + avail = snd_pcm_playback_avail(runtime);
> > + else
> > + avail = snd_pcm_capture_avail(runtime);
> > + if (avail >= runtime->twake)
> > + goto _endloop;
> > +
>
> Instead of adding this, we can move the check in the for loop at the
> beginning of the loop, no?
FYI, I applied the patch below to my tree. It contains Andrew's fix
and my slight refactoring.
thanks,
Takashi
---
From: Arjan van de Ven <arjan@...radead.org>
Subject: ALSA: pcm - fix race condition in wait_for_avail()
wait_for_avail() in pcm_lib.c has a race in it (observed in practice by an
Intel validation group).
The function is supposed to return once space in the buffer has become
available, or if some timeout happens. The entity that creates space (irq
handler of sound driver and some such) will do a wake up on a waitqueue
that this function registers for.
However there are two races in the existing code
1) If space became available between the caller noticing there was no
space and this function actually sleeping, the wakeup is missed and the
timeout condition will happen instead
2) If a wakeup happened but not sufficient space became available, the
code will loop again and wait for more space. However, if the second
wake comes in prior to hitting the schedule_timeout_interruptible(), it
will be missed, and potentially you'll wait out until the timeout
happens.
The fix consists of using more careful setting of the current state (so
that if a wakeup happens in the main loop window, the schedule_timeout()
falls through) and by checking for available space prior to going into the
schedule_timeout() loop, but after being on the waitqueue and having the
state set to interruptible.
[tiwai: the following changes have been added to Arjan's original patch:
- merged akpm's fix for waitqueue adding order into a single patch
- reduction of duplicated code of avail check
]
Signed-off-by: Arjan van de Ven <arjan@...ux.intel.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Cc: <stable@...nel.org>
Signed-off-by: Takashi Iwai <tiwai@...e.de>
---
sound/core/pcm_lib.c | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 86d0caf..62e90b8 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1761,6 +1761,10 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
snd_pcm_uframes_t avail = 0;
long wait_time, tout;
+ init_waitqueue_entry(&wait, current);
+ set_current_state(TASK_INTERRUPTIBLE);
+ add_wait_queue(&runtime->tsleep, &wait);
+
if (runtime->no_period_wakeup)
wait_time = MAX_SCHEDULE_TIMEOUT;
else {
@@ -1771,16 +1775,32 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
}
wait_time = msecs_to_jiffies(wait_time * 1000);
}
- init_waitqueue_entry(&wait, current);
- add_wait_queue(&runtime->tsleep, &wait);
+
for (;;) {
if (signal_pending(current)) {
err = -ERESTARTSYS;
break;
}
+
+ /*
+ * We need to check if space became available already
+ * (and thus the wakeup happened already) first to close
+ * the race of space already having become available.
+ * This check must happen after been added to the waitqueue
+ * and having current state be INTERRUPTIBLE.
+ */
+ if (is_playback)
+ avail = snd_pcm_playback_avail(runtime);
+ else
+ avail = snd_pcm_capture_avail(runtime);
+ if (avail >= runtime->twake)
+ break;
snd_pcm_stream_unlock_irq(substream);
- tout = schedule_timeout_interruptible(wait_time);
+
+ tout = schedule_timeout(wait_time);
+
snd_pcm_stream_lock_irq(substream);
+ set_current_state(TASK_INTERRUPTIBLE);
switch (runtime->status->state) {
case SNDRV_PCM_STATE_SUSPENDED:
err = -ESTRPIPE;
@@ -1806,14 +1826,9 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
err = -EIO;
break;
}
- if (is_playback)
- avail = snd_pcm_playback_avail(runtime);
- else
- avail = snd_pcm_capture_avail(runtime);
- if (avail >= runtime->twake)
- break;
}
_endloop:
+ set_current_state(TASK_RUNNING);
remove_wait_queue(&runtime->tsleep, &wait);
*availp = avail;
return err;
--
1.7.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists