From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D53C26B2C8; Tue, 12 Aug 2025 17:47:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755020839; cv=none; b=CG5j6lih0aDCEZCwBMtskWV1AKaBeUDWIekspND+q4yCBXYBFksR2p5/6TqkbuI2LxZObrCZd4aEXADWk6z9Gp5eu05niDA2YWi7nxeWJJfsksCw0DpqtQQ9fVX0h8QBOuWwdm1CypiOc0ufiEMAwWgSg/m+7qY1jY3g0t2qt4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755020839; c=relaxed/simple; bh=VW0KwC0zSjpPwvsuk437m1P4XWUGzUZDWFKF4lmQ1hk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ghV+LIO5FQd9U7bIHDjV619+EjIV8py/QIE/9qbtCu7fVJ/znwPzdjSLESr9LPhvvco4lwptC8Ow4mcBWBai5MEtVnYEkkF9KgM4eA56RldsmpbXYIY+Qixi61rHqJVMR4bri5cvQ9+V2Mm6nhiGnvqJmK8I268lqB9J12wv0jQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GVS3niOa; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GVS3niOa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF054C4CEF0; Tue, 12 Aug 2025 17:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755020839; bh=VW0KwC0zSjpPwvsuk437m1P4XWUGzUZDWFKF4lmQ1hk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GVS3niOaKbClzGH5xiZPqz3CR12TaL+EmoivOe6fFhQ3/5Duz1LEq+VrsrHgDp5IS 9m+TowtE4hfh3HqL9U9QVwRQvSpelLlYJQXjRp+6fMb2HYhVi76yoZfMkJoT5huN1m AH+S21Au6wTQKIMr6VQppUFodATQleTmv2GnwG9c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chenyuan Yang , Helge Deller , Sasha Levin Subject: [PATCH 6.1 176/253] fbdev: imxfb: Check fb_add_videomode to prevent null-ptr-deref Date: Tue, 12 Aug 2025 19:29:24 +0200 Message-ID: <20250812172956.240354285@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812172948.675299901@linuxfoundation.org> References: <20250812172948.675299901@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chenyuan Yang [ 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: 1b6c79361ba5 ("video: imxfb: Add DT support") Signed-off-by: Chenyuan Yang Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/imxfb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 32b8374abeca..3770225a0b90 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -1011,8 +1011,13 @@ static int imxfb_probe(struct platform_device *pdev) info->fix.smem_start = fbi->map_dma; 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 -- 2.39.5