2023-02-25 19:11:06

by Dmitry Fomin

Subject: [PATCH 1/2] ALSA: ice1712: Do not left ice->gpio_mutex locked in aureon_add_controls()

If snd_ctl_add() fails in aureon_add_controls(), it immediately returns
and leaves ice->gpio_mutex locked. ice->gpio_mutex locks in
snd_ice1712_save_gpio_status and unlocks in
snd_ice1712_restore_gpio_status(ice).

It seems that the mutex is required only for aureon_cs8415_get(),
so snd_ice1712_restore_gpio_status(ice) can be placed
just after that. Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Dmitry Fomin <[email protected]>
---
sound/pci/ice1712/aureon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 9a30f6d35d13..40a0e0095030 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -1892,6 +1892,7 @@ static int aureon_add_controls(struct snd_ice1712 *ice)
unsigned char id;
snd_ice1712_save_gpio_status(ice);
id = aureon_cs8415_get(ice, CS8415_ID);
+ snd_ice1712_restore_gpio_status(ice);
if (id != 0x41)
dev_info(ice->card->dev,
"No CS8415 chip. Skipping CS8415 controls.\n");
@@ -1909,7 +1910,6 @@ static int aureon_add_controls(struct snd_ice1712 *ice)
kctl->id.device = ice->pcm->device;
}
}
- snd_ice1712_restore_gpio_status(ice);
}

return 0;
--
2.37.2

2023-03-03 13:31:27

by Takashi Iwai

Subject: Re: [PATCH 1/2] ALSA: ice1712: Do not left ice->gpio_mutex locked in aureon_add_controls()

On Sat, 25 Feb 2023 19:43:21 +0100,
Dmitry Fomin wrote:
>
> If snd_ctl_add() fails in aureon_add_controls(), it immediately returns
> and leaves ice->gpio_mutex locked. ice->gpio_mutex locks in
> snd_ice1712_save_gpio_status and unlocks in
> snd_ice1712_restore_gpio_status(ice).
>
> It seems that the mutex is required only for aureon_cs8415_get(),
> so snd_ice1712_restore_gpio_status(ice) can be placed
> just after that. Compile tested only.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Dmitry Fomin <[email protected]>

Applied both patches now. Thanks.


Takashi