aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnirudh Rayabharam <[email protected]>2021-05-17 00:57:14 +0530
committerGreg Kroah-Hartman <[email protected]>2021-05-21 15:04:05 +0200
commit02625c965239b71869326dd0461615f27307ecb3 (patch)
treef977e43ab1a1e895b291a78284ddf65d24347a1c
parentd33ca7d2e8db435ae0e514877e83e07bbf283baa (diff)
video: hgafb: correctly handle card detect failure during probe
The return value of hga_card_detect() is not properly handled causing the probe to succeed even though hga_card_detect() failed. Since probe succeeds, hgafb_open() can be called which will end up operating on an unmapped hga_vram. This results in an out-of-bounds access as reported by kernel test robot [1]. To fix this, correctly detect failure of hga_card_detect() by checking for a non-zero error code. [1]: https://lore.kernel.org/lkml/20210516150019.GB25903@xsang-OptiPlex-9020/ Fixes: dc13cac4862c ("video: hgafb: fix potential NULL pointer dereference") Cc: stable <[email protected]> Reported-by: kernel test robot <[email protected]> Reviewed-by: Igor Matheus Andrade Torrente <[email protected]> Signed-off-by: Anirudh Rayabharam <[email protected]> Signed-off-by: Dan Carpenter <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/video/fbdev/hgafb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c
index cc8e62ae93f6..bd3d07aa4f0e 100644
--- a/drivers/video/fbdev/hgafb.c
+++ b/drivers/video/fbdev/hgafb.c
@@ -558,7 +558,7 @@ static int hgafb_probe(struct platform_device *pdev)
int ret;
ret = hga_card_detect();
- if (!ret)
+ if (ret)
return ret;
printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n",