Skip to content

Commit

Permalink
video: hgafb: correctly handle card detect failure during probe
Browse files Browse the repository at this point in the history
commit 02625c9 upstream.

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: dc13cac ("video: hgafb: fix potential NULL pointer dereference")
Cc: stable <stable@vger.kernel.org>
Reported-by: kernel test robot <oliver.sang@intel.com>
Reviewed-by: Igor Matheus Andrade Torrente <igormtorrente@gmail.com>
Signed-off-by: Anirudh Rayabharam <mail@anirudhrb.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20210516192714.25823-1-mail@anirudhrb.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Anirudh Rayabharam authored and Greg Kroah-Hartman committed May 26, 2021
1 parent e6c40c7 commit e7a4868
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/video/fbdev/hgafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit e7a4868

Please sign in to comment.