[PATCH 05/10] mei: vsc: Destroy mutex after freeing the IRQ

Hans de Goede posted 10 patches 3 months, 2 weeks ago
[PATCH 05/10] mei: vsc: Destroy mutex after freeing the IRQ
Posted by Hans de Goede 3 months, 2 weeks ago
The event_notify callback which runs from vsc_tp_thread_isr may call
vsc_tp_xfer() which locks the mutex. So the ISR depends on the mutex.

Move the mutex_destroy() call to after free_irq() to ensure that the ISR
is not running while the mutex is destroyed.

Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device")
Signed-off-by: Hans de Goede <hansg@kernel.org>
---
 drivers/misc/mei/vsc-tp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c
index f5438a600430..0feebffabdb3 100644
--- a/drivers/misc/mei/vsc-tp.c
+++ b/drivers/misc/mei/vsc-tp.c
@@ -521,10 +521,10 @@ static int vsc_tp_probe(struct spi_device *spi)
 	return 0;
 
 err_destroy_lock:
-	mutex_destroy(&tp->mutex);
-
 	free_irq(spi->irq, tp);
 
+	mutex_destroy(&tp->mutex);
+
 	return ret;
 }
 
@@ -535,9 +535,9 @@ static void vsc_tp_remove(struct spi_device *spi)
 
 	platform_device_unregister(tp->pdev);
 
-	mutex_destroy(&tp->mutex);
-
 	free_irq(spi->irq, tp);
+
+	mutex_destroy(&tp->mutex);
 }
 
 static const struct acpi_device_id vsc_tp_acpi_ids[] = {
-- 
2.49.0
RE: [PATCH 05/10] mei: vsc: Destroy mutex after freeing the IRQ
Posted by Usyskin, Alexander 3 months, 2 weeks ago
> Subject: [PATCH 05/10] mei: vsc: Destroy mutex after freeing the IRQ
> 
> The event_notify callback which runs from vsc_tp_thread_isr may call
> vsc_tp_xfer() which locks the mutex. So the ISR depends on the mutex.
> 
> Move the mutex_destroy() call to after free_irq() to ensure that the ISR
> is not running while the mutex is destroyed.
> 

Reviewed-by: Alexander Usyskin <alexander.usyskin@intel.com>

> Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device")
> Signed-off-by: Hans de Goede <hansg@kernel.org>
> ---
>  drivers/misc/mei/vsc-tp.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c
> index f5438a600430..0feebffabdb3 100644
> --- a/drivers/misc/mei/vsc-tp.c
> +++ b/drivers/misc/mei/vsc-tp.c
> @@ -521,10 +521,10 @@ static int vsc_tp_probe(struct spi_device *spi)
>  	return 0;
> 
>  err_destroy_lock:
> -	mutex_destroy(&tp->mutex);
> -
>  	free_irq(spi->irq, tp);
> 
> +	mutex_destroy(&tp->mutex);
> +
>  	return ret;
>  }
> 
> @@ -535,9 +535,9 @@ static void vsc_tp_remove(struct spi_device *spi)
> 
>  	platform_device_unregister(tp->pdev);
> 
> -	mutex_destroy(&tp->mutex);
> -
>  	free_irq(spi->irq, tp);
> +
> +	mutex_destroy(&tp->mutex);
>  }
> 
>  static const struct acpi_device_id vsc_tp_acpi_ids[] = {
> --
> 2.49.0