Skip to content

Commit

Permalink
ALSA: hda: Fix put_device() inconsistency in error path
Browse files Browse the repository at this point in the history
AVS HDAudio bus driver does not tie with codec drivers tighly. Codec
device and its respective driver cleanup procedures are split and may
not occur one after the other. Device cleanup is performed only on
snd_hdac_ext_bus_device_remove() i.e. it's the bus driver's
responsibility. If codec component probing fails, put_device() found in
snd_hda_codec_device_new() may lead to page fault. Relocate it to
snd_hda_codec_new() to address the problem on ASoC side while keeping
status quo for snd_hda_intel.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220706120230.427296-5-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Cezary Rojewski authored and Takashi Iwai committed Jul 9, 2022
1 parent 9c76958 commit ebe043a
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -950,14 +950,19 @@ int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
unsigned int codec_addr, struct hda_codec **codecp)
{
struct hda_codec *codec;
int ret;

codec = snd_hda_codec_device_init(bus, codec_addr, "hdaudioC%dD%d",
card->number, codec_addr);
if (IS_ERR(codec))
return PTR_ERR(codec);
*codecp = codec;

return snd_hda_codec_device_new(bus, card, codec_addr, *codecp, true);
ret = snd_hda_codec_device_new(bus, card, codec_addr, *codecp, true);
if (ret)
put_device(hda_codec_dev(*codecp));

return ret;
}
EXPORT_SYMBOL_GPL(snd_hda_codec_new);

Expand Down Expand Up @@ -1012,19 +1017,17 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,

if (codec->bus->modelname) {
codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);
if (!codec->modelname) {
err = -ENOMEM;
goto error;
}
if (!codec->modelname)
return -ENOMEM;
}

fg = codec->core.afg ? codec->core.afg : codec->core.mfg;
err = read_widget_caps(codec, fg);
if (err < 0)
goto error;
return err;
err = read_pin_defaults(codec);
if (err < 0)
goto error;
return err;

/* power-up all before initialization */
hda_set_power_state(codec, AC_PWRST_D0);
Expand All @@ -1042,7 +1045,7 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
/* ASoC features component management instead */
err = snd_device_new(card, SNDRV_DEV_CODEC, codec, &dev_ops);
if (err < 0)
goto error;
return err;
}

#ifdef CONFIG_PM
Expand All @@ -1055,10 +1058,6 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
#endif

return 0;

error:
put_device(hda_codec_dev(codec));
return err;
}
EXPORT_SYMBOL_GPL(snd_hda_codec_device_new);

Expand Down

0 comments on commit ebe043a

Please sign in to comment.