projects
/
wrapfs-5.12.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8010106
)
ASoC: fsl_xcvr: check return value after calling platform_get_resource_byname()
author
Yang Yingliang
<yangyingliang@huawei.com>
Tue, 15 Jun 2021 01:39:22 +0000
(09:39 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:02:11 +0000
(16:02 +0200)
[ 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
patch
|
blob
|
history
diff --git
a/sound/soc/fsl/fsl_xcvr.c
b/sound/soc/fsl/fsl_xcvr.c
index 070e3f32859fa63f9622e847746402a2dffde62e..244a35122fbceecaaf7da345fb4c05a07e96a22d 100644
(file)
--- 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;