From: Greg Kroah-Hartman Date: Wed, 26 May 2021 07:29:43 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.270~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=632610bd17b08ced1deeed40e46a4c45f9f1ce61;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: video-hgafb-correctly-handle-card-detect-failure-during-probe.patch --- diff --git a/queue-4.9/series b/queue-4.9/series index 71cd254cdd9..d8a447f8790 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -33,3 +33,4 @@ vgacon-record-video-mode-changes-with-vt_resizex.patch vt-fix-character-height-handling-with-vt_resizex.patch tty-vt-always-invoke-vc-vc_sw-con_resize-callback.patch iio-tsl2583-fix-division-by-a-zero-lux_val.patch +video-hgafb-correctly-handle-card-detect-failure-during-probe.patch diff --git a/queue-4.9/video-hgafb-correctly-handle-card-detect-failure-during-probe.patch b/queue-4.9/video-hgafb-correctly-handle-card-detect-failure-during-probe.patch new file mode 100644 index 00000000000..d4f9481b13d --- /dev/null +++ b/queue-4.9/video-hgafb-correctly-handle-card-detect-failure-during-probe.patch @@ -0,0 +1,43 @@ +From 02625c965239b71869326dd0461615f27307ecb3 Mon Sep 17 00:00:00 2001 +From: Anirudh Rayabharam +Date: Mon, 17 May 2021 00:57:14 +0530 +Subject: video: hgafb: correctly handle card detect failure during probe + +From: Anirudh Rayabharam + +commit 02625c965239b71869326dd0461615f27307ecb3 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: dc13cac4862c ("video: hgafb: fix potential NULL pointer dereference") +Cc: stable +Reported-by: kernel test robot +Reviewed-by: Igor Matheus Andrade Torrente +Signed-off-by: Anirudh Rayabharam +Signed-off-by: Dan Carpenter +Link: https://lore.kernel.org/r/20210516192714.25823-1-mail@anirudhrb.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/fbdev/hgafb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/fbdev/hgafb.c ++++ b/drivers/video/fbdev/hgafb.c +@@ -558,7 +558,7 @@ static int hgafb_probe(struct platform_d + int ret; + + ret = hga_card_detect(); +- if (!ret) ++ if (ret) + return ret; + + printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n",