summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorCai Xinchen <caixinchen1@huawei.com>2024-04-16 09:51:37 +0300
committerHelge Deller <deller@gmx.de>2024-04-25 13:04:18 +0300
commit6ad959b6703e2c4c5d7af03b4cfd5ff608036339 (patch)
tree98e64f9b41679b4ab1682f3e19e779f1a9a80571 /drivers/video
parent5317797e9cd07ff48132a36d545c25c1687ee676 (diff)
downloadlinux-6ad959b6703e2c4c5d7af03b4cfd5ff608036339.tar.xz
fbdev: savage: Handle err return when savagefb_check_var failed
The commit 04e5eac8f3ab("fbdev: savage: Error out if pixclock equals zero") checks the value of pixclock to avoid divide-by-zero error. However the function savagefb_probe doesn't handle the error return of savagefb_check_var. When pixclock is 0, it will cause divide-by-zero error. Fixes: 04e5eac8f3ab ("fbdev: savage: Error out if pixclock equals zero") Signed-off-by: Cai Xinchen <caixinchen1@huawei.com> Cc: stable@vger.kernel.org Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/savage/savagefb_driver.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c
index ebc9aeffdde7..ac41f8f37589 100644
--- a/drivers/video/fbdev/savage/savagefb_driver.c
+++ b/drivers/video/fbdev/savage/savagefb_driver.c
@@ -2276,7 +2276,10 @@ static int savagefb_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (info->var.xres_virtual > 0x1000)
info->var.xres_virtual = 0x1000;
#endif
- savagefb_check_var(&info->var, info);
+ err = savagefb_check_var(&info->var, info);
+ if (err)
+ goto failed;
+
savagefb_set_fix(info);
/*