Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5693f2 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

media: video-mux: fix null pointer dereferences 



[ Upstream commit aeb0d0f581e2079868e64a2e5ee346d340376eae ]

devm_kcalloc may fail and return a null pointer. The fix returns
-ENOMEM upon failures to avoid null pointer dereferences.

Signed-off-by: default avatarKangjie Lu <kjlu@umn.edu>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bc75207a

drivers/media/platform/video-mux.c

+5 −0
Original line number Diff line number Diff line
@@ -365,9 +365,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