Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 495f926c authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: core: Fix deadlock in snd_soc_instantiate_card() 



Move the client_mutex lock to snd_soc_unbind_card() before
removing link components. This prevents the deadlock
in the error path in snd_soc_instantiate_card().

Fixes: 34ac3c3e (ASoC: core: lock client_mutex while removing
link components)
Reported-by: default avatarkernelci.org bot <bot@kernelci.org>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 04268bf2

sound/soc/soc-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1008,14 +1008,12 @@ static void soc_remove_link_components(struct snd_soc_card *card, 
	struct snd_soc_component *component;

	struct snd_soc_rtdcom_list *rtdcom;



	mutex_lock(&client_mutex);

	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		if (component->driver->remove_order == order)

			soc_remove_component(component);

	}

	mutex_unlock(&client_mutex);

}



static void soc_remove_dai_links(struct snd_soc_card *card)
@@ -2839,12 +2837,14 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister) 
		snd_soc_dapm_shutdown(card);

		snd_soc_flush_all_delayed_work(card);



		mutex_lock(&client_mutex);

		/* remove all components used by DAI links on this card */

		for_each_comp_order(order) {

			for_each_card_rtds(card, rtd) {

				soc_remove_link_components(card, rtd, order);

			}

		}

		mutex_unlock(&client_mutex);



		soc_cleanup_card_resources(card);

		if (!unregister)