From 58c0cc2d90f1e37c4eb63ae7f164c83830833f78 Mon Sep 17 00:00:00 2001

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Date: Mon, 3 May 2021 13:57:05 +0200

Subject: Revert "video: hgafb: fix potential NULL pointer dereference"

Git-commit: 58c0cc2d90f1e37c4eb63ae7f164c83830833f78

Patch-mainline: v5.13-rc3

References: bsc#1129770

This reverts commit ec7f6aad57ad29e4e66cc2e18e1e1599ddb02542.

Because of recent interactions with developers from @umn.edu, all

commits from them have been recently re-reviewed to ensure if they were

correct or not.

Upon review, this commit was found to be incorrect for the reasons

below, so it must be reverted.  It will be fixed up "correctly" in a

later kernel change.

This patch "looks" correct, but the driver keeps on running and will

fail horribly right afterward if this error condition ever trips.

So points for trying to resolve an issue, but a huge NEGATIVE value for

providing a "fake" fix for the problem as nothing actually got resolved

at all.  I'll go fix this up properly...

Cc: Kangjie Lu <kjlu@umn.edu>

Cc: Aditya Pakki <pakki001@umn.edu>

Cc: Ferenc Bakonyi <fero@drama.obuda.kando.hu>

Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

Fixes: ec7f6aad57ad ("video: hgafb: fix potential NULL pointer dereference")

Cc: stable <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/20210503115736.2104747-39-gregkh@linuxfoundation.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/video/fbdev/hgafb.c | 2 --

 1 file changed, 2 deletions(-)

diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c

index 8bbac7182ad3..fca29f219f8b 100644

--- a/drivers/video/fbdev/hgafb.c

+++ b/drivers/video/fbdev/hgafb.c

@@ -285,8 +285,6 @@ static int hga_card_detect(void)

 	hga_vram_len  = 0x08000;

 	hga_vram = ioremap(0xb0000, hga_vram_len);

-	if (!hga_vram)

-		goto error;

 	if (request_region(0x3b0, 12, "hgafb"))

 		release_io_ports = 1;

-- 

2.37.3