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

Commit 69373502 authored by Chenyuan Yang's avatar Chenyuan Yang Committed by Greg Kroah-Hartman
Browse files

fbdev: imxfb: Check fb_add_videomode to prevent null-ptr-deref 



[ Upstream commit da11e6a30e0bb8e911288bdc443b3dc8f6a7cac7 ]

fb_add_videomode() can fail with -ENOMEM when its internal kmalloc() cannot
allocate a struct fb_modelist.  If that happens, the modelist stays empty but
the driver continues to register.  Add a check for its return value to prevent
poteintial null-ptr-deref, which is similar to the commit 17186f1f90d3 ("fbdev:
Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var").

Fixes: 1b6c7936 ("video: imxfb: Add DT support")
Signed-off-by: default avatarChenyuan Yang <chenyuan0y@gmail.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e4c864a1

drivers/video/fbdev/imxfb.c

+7 −2
Original line number Diff line number Diff line
@@ -992,8 +992,13 @@ static int imxfb_probe(struct platform_device *pdev) 




	INIT_LIST_HEAD(&info->modelist);

	for (i = 0; i < fbi->num_modes; i++)

		fb_add_videomode(&fbi->mode[i].mode, &info->modelist);

	for (i = 0; i < fbi->num_modes; i++) {

		ret = fb_add_videomode(&fbi->mode[i].mode, &info->modelist);

		if (ret) {

			dev_err(&pdev->dev, "Failed to add videomode\n");

			goto failed_cmap;

		}

	}



	/*

	 * This makes sure that our colour bitfield