iio: light: opt3001: fix mutex unlock race
PATCH 1/1 iio: light: opt3001: fix mutex unlock race
When an end-of-conversion interrupt is received after performing a single-shot reading of the light sensor, the driver was waking up the result ready queue before checking opt->ok_to_ignore_lock to determine if it should unlock the mutex. The problem occurred in the case where the other thread woke up and changed the value of opt->ok_to_ignore_lock to false prior to the interrupt thread performing its read of the variable. In this case, the mutex would be unlocked twice.
--- drivers/iio/light/opt3001.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iio/light/opt3001.c +5 -1
@@ -686,6 +686,7 @@ static irqreturn_t opt3001_irq(int irq, void *_iio)struct iio_dev *iio = _iio;struct opt3001 *opt =iio_priv (iio);int ret; +bool wake_result_ready_queue = false;if (!opt->ok_to_ignore_lock)mutex_lock (&opt->lock);
@@ -720,13 +721,16 @@ static irqreturn_t opt3001_irq(int irq, void *_iio) } opt->result = ret; opt->result_ready = true; -wake_up (&opt->result_ready_queue); + wake_result_ready_queue = true; } out:if (!opt->ok_to_ignore_lock)mutex_unlock (&opt->lock); +if (wake_result_ready_queue) +wake_up (&opt->result_ready_queue); +return IRQ_HANDLED ; }
Signature · 1 line
2.23.0
David,
Quoted 10 lines · David Frey
When an end-of-conversion interrupt is received after performing a single-shot reading of the light sensor, the driver was waking up the result ready queue before checking
opt->ok_to_ignore_lockto determine if it should unlock the mutex. The problem occurred in the case where the other thread woke up and changed the value ofopt->ok_to_ignore_lockto false prior to the interrupt thread performing its read of the variable. In this case, the mutex would be unlocked twice.Signed-off-by David Frey <[email protected]>---
Good find, thanks for the submission.
--
Andreas Dannenberg
Texas Instruments Inc
Quoted 36 lines
drivers/iio/light/opt3001.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/iio/light/opt3001.c +5
-1@@ -686,6 +686,7 @@ static irqreturn_t opt3001_irq(int irq, void *_iio)struct iio_dev *iio = _iio;struct opt3001 *opt =iio_priv (iio);int ret; +bool wake_result_ready_queue = false;if (!opt->ok_to_ignore_lock)mutex_lock (&opt->lock);@@ -720,13 +721,16 @@ static irqreturn_t opt3001_irq(int irq, void *_iio) } opt->result = ret; opt->result_ready = true; -wake_up (&opt->result_ready_queue); + wake_result_ready_queue = true; } out:if (!opt->ok_to_ignore_lock)mutex_unlock (&opt->lock); +if (wake_result_ready_queue) +wake_up (&opt->result_ready_queue); +return IRQ_HANDLED ; }Signature · 1 line
2.23.0
Quoted 11 lines · On Fri, 20 Sep 2019 12:40:37 -0500 Andreas Dannenberg <[email protected]> wrote:
David,
Quoted 8 lines · David Frey
When an end-of-conversion interrupt is received after performing a single-shot reading of the light sensor, the driver was waking up the result ready queue before checking
opt->ok_to_ignore_lockto determine if it should unlock the mutex. The problem occurred in the case where the other thread woke up and changed the value ofopt->ok_to_ignore_lockto false prior to the interrupt thread performing its read of the variable. In this case, the mutex would be unlocked twice.
Quoted 6 lines
Quoted 2 lines
Signed-off-by David Frey <[email protected]>---
Good find, thanks for the submission.
Reviewed-by Andreas Dannenberg <[email protected]>
I think this goes all the way back to the initial driver so I've added a fixes tag for that and marked it for stable.
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
Quoted 42 lines
--
Andreas Dannenberg
Texas Instruments IncQuoted 36 lines
drivers/iio/light/opt3001.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/iio/light/opt3001.c +5
-1@@ -686,6 +686,7 @@ static irqreturn_t opt3001_irq(int irq, void *_iio)struct iio_dev *iio = _iio;struct opt3001 *opt =iio_priv (iio);int ret; +bool wake_result_ready_queue = false;if (!opt->ok_to_ignore_lock)mutex_lock (&opt->lock);@@ -720,13 +721,16 @@ static irqreturn_t opt3001_irq(int irq, void *_iio) } opt->result = ret; opt->result_ready = true; -wake_up (&opt->result_ready_queue); + wake_result_ready_queue = true; } out:if (!opt->ok_to_ignore_lock)mutex_unlock (&opt->lock); +if (wake_result_ready_queue) +wake_up (&opt->result_ready_queue); +return IRQ_HANDLED ; }Signature · 1 line
2.23.0