Commit 03d5d959 authored Aug 05, 2024 by Elinor Montmasson Committed by Ye Bin Aug 05, 2024

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

mainline inclusion
from mainline-v6.10-rc6
commit 90f3feb24172185f1832636264943e8b5e289245
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGEP3
CVE: CVE-2024-42089

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=90f3feb24172185f1832636264943e8b5e289245



-------------------------------------------

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: Elinor Montmasson <elinor.montmasson@savoirfairelinux.com>
Link: https://patch.msgid.link/20240620132511.4291-2-elinor.montmasson@savoirfairelinux.com


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Ye Bin <yebin10@huawei.com>

parent 715938fd

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -538,6 +538,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)
		@@ -718,7 +720,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");