Commit 28b329f4 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Takashi Iwai

ALSA: hda: hda_component: Fix mutex crash if nothing ever binds

Move the initialization of parent->mutex into
hda_component_manager_init() so that it is always valid.

In hda_component_manager_bind() do not clear the parent information.
Only zero-fill the per-component data ready for it to be filled in
by the components as they bind.

Previously parent->mutex was being initialized only in
hda_component_manager_bind(). This meant that it was only
initialized if all components appeared and there was a bind callback.
If there wasn't a bind the mutex object was not valid when the
Realtek driver called any of the other functions.
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 047b9cbb ("ALSA: hda: hda_component: Protect shared data with a mutex")
Link: https://patch.msgid.link/20240826094940.45563-1-rf@opensource.cirrus.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2dc43c5e
...@@ -141,8 +141,7 @@ int hda_component_manager_bind(struct hda_codec *cdc, ...@@ -141,8 +141,7 @@ int hda_component_manager_bind(struct hda_codec *cdc,
int ret; int ret;
/* Init shared and component specific data */ /* Init shared and component specific data */
memset(parent, 0, sizeof(*parent)); memset(parent->comps, 0, sizeof(parent->comps));
mutex_init(&parent->mutex);
parent->codec = cdc; parent->codec = cdc;
mutex_lock(&parent->mutex); mutex_lock(&parent->mutex);
...@@ -164,6 +163,8 @@ int hda_component_manager_init(struct hda_codec *cdc, ...@@ -164,6 +163,8 @@ int hda_component_manager_init(struct hda_codec *cdc,
struct hda_scodec_match *sm; struct hda_scodec_match *sm;
int ret, i; int ret, i;
mutex_init(&parent->mutex);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
sm = devm_kmalloc(dev, sizeof(*sm), GFP_KERNEL); sm = devm_kmalloc(dev, sizeof(*sm), GFP_KERNEL);
if (!sm) if (!sm)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment