| From a293ec7787e24b463702ed57a64648f8c677a65d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 15 Jun 2021 09:39:22 +0800 |
| Subject: ASoC: fsl_xcvr: check return value after calling |
| platform_get_resource_byname() |
| |
| From: Yang Yingliang <yangyingliang@huawei.com> |
| |
| [ Upstream commit a2f6ed4a44721d3a9fdf4da7e0743cb13866bf61 ] |
| |
| It will cause null-ptr-deref if platform_get_resource_byname() returns NULL, |
| we need check the return value. |
| |
| Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> |
| Link: https://lore.kernel.org/r/20210615013922.784296-10-yangyingliang@huawei.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/fsl/fsl_xcvr.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c |
| index 070e3f32859f..244a35122fbc 100644 |
| --- a/sound/soc/fsl/fsl_xcvr.c |
| +++ b/sound/soc/fsl/fsl_xcvr.c |
| @@ -1205,6 +1205,10 @@ static int fsl_xcvr_probe(struct platform_device *pdev) |
| |
| rx_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rxfifo"); |
| tx_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "txfifo"); |
| + if (!rx_res || !tx_res) { |
| + dev_err(dev, "could not find rxfifo or txfifo resource\n"); |
| + return -EINVAL; |
| + } |
| xcvr->dma_prms_rx.chan_name = "rx"; |
| xcvr->dma_prms_tx.chan_name = "tx"; |
| xcvr->dma_prms_rx.addr = rx_res->start; |
| -- |
| 2.30.2 |
| |
