| From 3f1d525ca75e169f29c763b72e54b2cb749a9937 Mon Sep 17 00:00:00 2001 | |
| From: Sasha Levin <sashal@kernel.org> | |
| Date: Thu, 25 Jun 2026 11:39:33 +0200 | |
| Subject: drm/sysfb: simpledrm: Improve framebuffer-size validation | |
| From: Thomas Zimmermann <tzimmermann@suse.de> | |
| [ Upstream commit 03f1a3545b721fa7fdadd00080e237519a286a97 ] | |
| Validate the framebuffer size from the firmware against the | |
| limitations of struct drm_display_mode. The type only stores sizes | |
| in 16-bit fields. Fail probing on errors. | |
| v2: | |
| - remove unused function simplefb_get_validated_int0() (Sashiko) | |
| Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> | |
| Reviewed-by: Thierry Reding <treding@nvidia.com> | |
| Reviewed-by: Maxime Ripard <mripard@kernel.org> | |
| Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> | |
| Fixes: 11e8f5fd223b ("drm: Add simpledrm driver") | |
| Cc: <stable@vger.kernel.org> # v5.14+ | |
| Fixes: 11e8f5fd223b ("drm: Add simpledrm driver") | |
| Link: https://patch.msgid.link/20260625094509.157581-2-tzimmermann@suse.de | |
| [ sashal: Kept the local simplefb_get_validated_int0() helper and made it reject values above U16_MAX, since the tree lacks drm_sysfb_get_validated_int0(). ] | |
| Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| --- | |
| drivers/gpu/drm/tiny/simpledrm.c | 4 ++-- | |
| 1 file changed, 2 insertions(+), 2 deletions(-) | |
| diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c | |
| index d10574e630a86..5d18ed29bf634 100644 | |
| --- a/drivers/gpu/drm/tiny/simpledrm.c | |
| +++ b/drivers/gpu/drm/tiny/simpledrm.c | |
| @@ -52,12 +52,12 @@ static int | |
| simplefb_get_validated_int0(struct drm_device *dev, const char *name, | |
| uint32_t value) | |
| { | |
| - if (!value) { | |
| + if (!value || value > U16_MAX) { | |
| drm_err(dev, "simplefb: invalid framebuffer %s of %u\n", | |
| name, value); | |
| return -EINVAL; | |
| } | |
| - return simplefb_get_validated_int(dev, name, value); | |
| + return (int)value; | |
| } | |
| static const struct drm_format_info * | |
| -- | |
| 2.53.0 | |