summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMartin Kaiser <martin@kaiser.cx>2023-06-28 15:24:37 +0200
committerHelge Deller <deller@gmx.de>2023-07-11 07:22:45 +0200
commit4e47382fbca916d7db95cbf9e2d7ca2e9d1ca3fe (patch)
treea3af51e0ff195d806eb51fdfa59035b5ee9f6314 /drivers/video
parentLinux 6.5-rc1 (diff)
downloadlinux-4e47382fbca916d7db95cbf9e2d7ca2e9d1ca3fe.tar.xz
linux-4e47382fbca916d7db95cbf9e2d7ca2e9d1ca3fe.zip
fbdev: imxfb: warn about invalid left/right margin
Warn about invalid var->left_margin or var->right_margin. Their values are read from the device tree. We store var->left_margin-3 and var->right_margin-1 in register fields. These fields should be >= 0. Fixes: 7e8549bcee00 ("imxfb: Fix margin settings") Signed-off-by: Martin Kaiser <martin@kaiser.cx> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/imxfb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index adf36690c342..5fbcb78a9cae 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -613,10 +613,10 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
if (var->hsync_len < 1 || var->hsync_len > 64)
printk(KERN_ERR "%s: invalid hsync_len %d\n",
info->fix.id, var->hsync_len);
- if (var->left_margin > 255)
+ if (var->left_margin < 3 || var->left_margin > 255)
printk(KERN_ERR "%s: invalid left_margin %d\n",
info->fix.id, var->left_margin);
- if (var->right_margin > 255)
+ if (var->right_margin < 1 || var->right_margin > 255)
printk(KERN_ERR "%s: invalid right_margin %d\n",
info->fix.id, var->right_margin);
if (var->yres < 1 || var->yres > ymax_mask)