Unverified Commit 90f3feb2 authored by Elinor Montmasson's avatar Elinor Montmasson Committed by Mark Brown
Browse files

ASoC: fsl-asoc-card: set priv->pdev before using it 



priv->pdev pointer was set after being used in
fsl_asoc_card_audmux_init().
Move this assignment at the start of the probe function, so
sub-functions can correctly use pdev through priv.

fsl_asoc_card_audmux_init() dereferences priv->pdev to get access to the
dev struct, used with dev_err macros.
As priv is zero-initialised, there would be a NULL pointer dereference.
Note that if priv->dev is dereferenced before assignment but never used,
for example if there is no error to be printed, the driver won't crash
probably due to compiler optimisations.

Fixes: 708b4351 ("ASoC: fsl: Add Freescale Generic ASoC Sound Card with ASRC support")
Signed-off-by: default avatarElinor Montmasson <elinor.montmasson@savoirfairelinux.com>
Link: https://patch.msgid.link/20240620132511.4291-2-elinor.montmasson@savoirfairelinux.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 379bcd2c

sound/soc/fsl/fsl-asoc-card.c

+2 −1
Original line number Diff line number Diff line
@@ -559,6 +559,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	priv->pdev = pdev;



	cpu_np = of_parse_phandle(np, "audio-cpu", 0);

	/* Give a chance to old DT binding */

	if (!cpu_np)
@@ -787,7 +789,6 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	}



	/* Initialize sound card */

	priv->pdev = pdev;

	priv->card.dev = &pdev->dev;

	priv->card.owner = THIS_MODULE;

	ret = snd_soc_of_parse_card_name(&priv->card, "model");