lkml.org 
[lkml]   [2019]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] media: video-mux: fix null pointer dereferences
From
Date
On Sat, 2019-03-09 at 01:20 -0600, Kangjie Lu wrote:
> devm_kcalloc may fail and return a null pointer. The fix returns
> -ENOMEM upon failures to avoid null pointer dereferences.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> drivers/media/platform/video-mux.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c
> index c33900e3c23e..4135165cdabe 100644
> --- a/drivers/media/platform/video-mux.c
> +++ b/drivers/media/platform/video-mux.c
> @@ -399,9 +399,14 @@ static int video_mux_probe(struct platform_device *pdev)
> vmux->active = -1;
> vmux->pads = devm_kcalloc(dev, num_pads, sizeof(*vmux->pads),
> GFP_KERNEL);
> + if (!vmux->pads)
> + return -ENOMEM;
> +
> vmux->format_mbus = devm_kcalloc(dev, num_pads,
> sizeof(*vmux->format_mbus),
> GFP_KERNEL);
> + if (!vmux->format_mbus)
> + return -ENOMEM;
>
> for (i = 0; i < num_pads; i++) {
> vmux->pads[i].flags = (i < num_pads - 1) ? MEDIA_PAD_FL_SINK

Thank you,
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>

regards
Philipp

\
 
 \ /
  Last update: 2019-03-11 10:18    [W:0.054 / U:0.732 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site