diff options
| author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2017-08-27 08:46:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-27 14:30:29 +0200 |
| commit | 4243e0457c9b1fe5e96fba19296469466eb24b1d (patch) | |
| tree | e2a26df104b95fe6c3184084c294cafda4e69322 /sound/soc/davinci | |
| parent | ASoC: DaVinci: Delete an error message for a failed memory allocation in two ... (diff) | |
| download | linux-4243e0457c9b1fe5e96fba19296469466eb24b1d.tar.xz linux-4243e0457c9b1fe5e96fba19296469466eb24b1d.zip | |
ASoC: davinci-mcasp: check memory allocation failure
Check memory allocation failures and return -ENOMEM in such cases, as
already done above for another memory allocation.
This avoids NULL pointers dereference.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index d486908d4e0e..f395bbc7c354 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1851,6 +1851,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) mcasp->context.xrsr_regs = devm_kzalloc(&pdev->dev, sizeof(u32) * mcasp->num_serializer, GFP_KERNEL); + if (!mcasp->context.xrsr_regs) { + ret = -ENOMEM; + goto err; + } #endif mcasp->serial_dir = pdata->serial_dir; mcasp->version = pdata->version; |