Unverified Commit befe3045 authored by Ameer Hamza's avatar Ameer Hamza Committed by Mark Brown
Browse files

ASoC: test-component: fix null pointer dereference. 



Dereferncing of_id pointer will result in exception in current
implementation since of_match_device() will assign it to NULL.
Adding NULL check for protection.

Signed-off-by: default avatarAmeer Hamza <amhamza.mgc@gmail.com>
Link: https://lore.kernel.org/r/20211207142309.222820-1-amhamza.mgc@gmail.com


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

sound/soc/generic/test-component.c

+2 −6
Original line number Diff line number Diff line
@@ -531,17 +531,13 @@ static int test_driver_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct device_node *ep;

	const struct of_device_id *of_id = of_match_device(test_of_match, &pdev->dev);

	const struct test_adata *adata;

	const struct test_adata *adata = of_device_get_match_data(&pdev->dev);

	struct snd_soc_component_driver *cdriv;

	struct snd_soc_dai_driver *ddriv;

	struct test_dai_name *dname;

	struct test_priv *priv;

	int num, ret, i;



	if (!of_id)

		return -EINVAL;

	adata = of_id->data;

	num = of_graph_get_endpoint_count(node);

	if (!num) {

		dev_err(dev, "no port exits\n");
@@ -552,7 +548,7 @@ static int test_driver_probe(struct platform_device *pdev) 
	cdriv	= devm_kzalloc(dev, sizeof(*cdriv),		GFP_KERNEL);

	ddriv	= devm_kzalloc(dev, sizeof(*ddriv) * num,	GFP_KERNEL);

	dname	= devm_kzalloc(dev, sizeof(*dname) * num,	GFP_KERNEL);

	if (!priv || !cdriv || !ddriv || !dname)

	if (!priv || !cdriv || !ddriv || !dname || !adata)

		return -EINVAL;



	priv->dev		= dev;