| From eb44dc6806dfe70a32746c95bb9a323653f38b67 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 6 Dec 2021 01:42:00 +0500 |
| Subject: ASoC: test-component: fix null pointer dereference. |
| |
| From: Ameer Hamza <amhamza.mgc@gmail.com> |
| |
| [ Upstream commit c686316ec1210d43653c91e104c1e4cd0156dc89 ] |
| |
| 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: Ameer Hamza <amhamza.mgc@gmail.com> |
| Link: https://lore.kernel.org/r/20211205204200.7852-1-amhamza.mgc@gmail.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/generic/test-component.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c |
| index 85385a771d807..8fc97d3ff0110 100644 |
| --- a/sound/soc/generic/test-component.c |
| +++ b/sound/soc/generic/test-component.c |
| @@ -532,13 +532,16 @@ static int test_driver_probe(struct platform_device *pdev) |
| 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 = of_id->data; |
| + const struct test_adata *adata; |
| 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"); |
| -- |
| 2.34.1 |
| |
