Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1651632 > unrolled thread
| Started by | Alexey Khoroshilov <khoroshilov@ispras.ru> |
|---|---|
| First post | 2017-05-27 03:30 +0200 |
| Last post | 2017-05-28 16:50 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq() Alexey Khoroshilov <khoroshilov@ispras.ru> - 2017-05-27 03:30 +0200
Re: [PATCH] staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq() Lars-Peter Clausen <lars@metafoo.de> - 2017-05-28 11:50 +0200
Re: [PATCH] staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq() Jonathan Cameron <jic23@kernel.org> - 2017-05-28 16:50 +0200
| From | Alexey Khoroshilov <khoroshilov@ispras.ru> |
|---|---|
| Date | 2017-05-27 03:30 +0200 |
| Subject | [PATCH] staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq() |
| Message-ID | <tLyIj-4Vw-57@gated-at.bofh.it> |
ad7152_write_raw_samp_freq() is called by ad7152_write_raw() with
chip->state_lock held. So, there is unavoidable deadlock when
ad7152_write_raw_samp_freq() locks the mutex itself.
The patch removes unneeded locking.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
drivers/staging/iio/cdc/ad7152.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index dc6ecd824365..ff10d1f0a7e4 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -231,16 +231,12 @@ static int ad7152_write_raw_samp_freq(struct device *dev, int val)
if (i >= ARRAY_SIZE(ad7152_filter_rate_table))
i = ARRAY_SIZE(ad7152_filter_rate_table) - 1;
- mutex_lock(&chip->state_lock);
ret = i2c_smbus_write_byte_data(chip->client,
AD7152_REG_CFG2, AD7152_CFG2_OSR(i));
- if (ret < 0) {
- mutex_unlock(&chip->state_lock);
+ if (ret < 0)
return ret;
- }
chip->filter_rate_setup = i;
- mutex_unlock(&chip->state_lock);
return ret;
}
--
2.7.4
[toc] | [next] | [standalone]
| From | Lars-Peter Clausen <lars@metafoo.de> |
|---|---|
| Date | 2017-05-28 11:50 +0200 |
| Subject | Re: [PATCH] staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq() |
| Message-ID | <tM2ZH-by-11@gated-at.bofh.it> |
| In reply to | #1651632 |
On 05/27/2017 12:53 AM, Alexey Khoroshilov wrote:
> ad7152_write_raw_samp_freq() is called by ad7152_write_raw() with
> chip->state_lock held. So, there is unavoidable deadlock when
> ad7152_write_raw_samp_freq() locks the mutex itself.
>
> The patch removes unneeded locking.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Looks good, thanks.
Fixes: 6572389bcc11 ("staging: iio: cdc: ad7152: Implement
IIO_CHAN_INFO_SAMP_FREQ attribute")
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> drivers/staging/iio/cdc/ad7152.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
> index dc6ecd824365..ff10d1f0a7e4 100644
> --- a/drivers/staging/iio/cdc/ad7152.c
> +++ b/drivers/staging/iio/cdc/ad7152.c
> @@ -231,16 +231,12 @@ static int ad7152_write_raw_samp_freq(struct device *dev, int val)
> if (i >= ARRAY_SIZE(ad7152_filter_rate_table))
> i = ARRAY_SIZE(ad7152_filter_rate_table) - 1;
>
> - mutex_lock(&chip->state_lock);
> ret = i2c_smbus_write_byte_data(chip->client,
> AD7152_REG_CFG2, AD7152_CFG2_OSR(i));
> - if (ret < 0) {
> - mutex_unlock(&chip->state_lock);
> + if (ret < 0)
> return ret;
> - }
>
> chip->filter_rate_setup = i;
> - mutex_unlock(&chip->state_lock);
>
> return ret;
> }
>
[toc] | [prev] | [next] | [standalone]
| From | Jonathan Cameron <jic23@kernel.org> |
|---|---|
| Date | 2017-05-28 16:50 +0200 |
| Subject | Re: [PATCH] staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq() |
| Message-ID | <tM7G2-3f9-11@gated-at.bofh.it> |
| In reply to | #1652081 |
On Sun, 28 May 2017 11:47:04 +0200
Lars-Peter Clausen <lars@metafoo.de> wrote:
> On 05/27/2017 12:53 AM, Alexey Khoroshilov wrote:
> > ad7152_write_raw_samp_freq() is called by ad7152_write_raw() with
> > chip->state_lock held. So, there is unavoidable deadlock when
> > ad7152_write_raw_samp_freq() locks the mutex itself.
> >
> > The patch removes unneeded locking.
> >
> > Found by Linux Driver Verification project (linuxtesting.org).
> >
> > Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
>
> Looks good, thanks.
>
> Fixes: 6572389bcc11 ("staging: iio: cdc: ad7152: Implement
> IIO_CHAN_INFO_SAMP_FREQ attribute")
> Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the fixes-togreg branch of iio.git.
Thanks,
Jonathan
>
>
> > ---
> > drivers/staging/iio/cdc/ad7152.c | 6 +-----
> > 1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
> > index dc6ecd824365..ff10d1f0a7e4 100644
> > --- a/drivers/staging/iio/cdc/ad7152.c
> > +++ b/drivers/staging/iio/cdc/ad7152.c
> > @@ -231,16 +231,12 @@ static int ad7152_write_raw_samp_freq(struct device *dev, int val)
> > if (i >= ARRAY_SIZE(ad7152_filter_rate_table))
> > i = ARRAY_SIZE(ad7152_filter_rate_table) - 1;
> >
> > - mutex_lock(&chip->state_lock);
> > ret = i2c_smbus_write_byte_data(chip->client,
> > AD7152_REG_CFG2, AD7152_CFG2_OSR(i));
> > - if (ret < 0) {
> > - mutex_unlock(&chip->state_lock);
> > + if (ret < 0)
> > return ret;
> > - }
> >
> > chip->filter_rate_setup = i;
> > - mutex_unlock(&chip->state_lock);
> >
> > return ret;
> > }
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web