diff options
| author | Gustavo A. R. Silva <garsilva@embeddedor.com> | 2017-11-22 22:34:44 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 09:09:58 +0100 |
| commit | 33964687ffd1bcfc21e9e3479f6ec3b654bb96fe (patch) | |
| tree | acd4eb17d5c682442d08c357fa381e5b04e59038 | |
| parent | 1ed91b10c4e40f433c0038652831197a87d45de2 (diff) | |
| download | linux-stable-33964687ffd1bcfc21e9e3479f6ec3b654bb96fe.tar.gz linux-stable-33964687ffd1bcfc21e9e3479f6ec3b654bb96fe.tar.bz2 linux-stable-33964687ffd1bcfc21e9e3479f6ec3b654bb96fe.zip | |
media: davinci: vpif_capture: add NULL check on devm_kzalloc return value
[ Upstream commit 5a18c2434f8bfc8bc2fb0f8af3e44f7408d63e4f ]
Check return value from call to devm_kzalloc() in order to prevent
a NULL pointer dereference.
This issue was detected with the help of Coccinelle.
Fixes: 4a5f8ae50b66 ("[media] davinci: vpif_capture: get subdevs from DT when available")
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index fca4dc829f73..e45916f69def 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1550,6 +1550,8 @@ vpif_capture_get_pdata(struct platform_device *pdev) sizeof(*chan->inputs) * VPIF_CAPTURE_NUM_CHANNELS, GFP_KERNEL); + if (!chan->inputs) + return NULL; chan->input_count++; chan->inputs[i].input.type = V4L2_INPUT_TYPE_CAMERA; |