diff options
author | Kangjie Lu <kjlu@umn.edu> | 2019-04-01 17:46:58 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-15 11:54:10 +0200 |
commit | 1f2611af4581a556dff4e99c860e3d1c1c6c3024 (patch) | |
tree | 857af9203dccc758b494253f735d1b938e849393 | |
parent | 5957f6f5aaa67ced66e4a50264cfdbf6049f7a4b (diff) | |
download | linux-stable-1f2611af4581a556dff4e99c860e3d1c1c6c3024.tar.gz linux-stable-1f2611af4581a556dff4e99c860e3d1c1c6c3024.tar.bz2 linux-stable-1f2611af4581a556dff4e99c860e3d1c1c6c3024.zip |
video: hgafb: fix potential NULL pointer dereference
[ Upstream commit ec7f6aad57ad29e4e66cc2e18e1e1599ddb02542 ]
When ioremap fails, hga_vram should not be dereferenced. The fix
check the failure to avoid NULL pointer dereference.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Cc: Aditya Pakki <pakki001@umn.edu>
Cc: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
[b.zolnierkie: minor patch summary fixup]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | drivers/video/fbdev/hgafb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c index 463028543173..59e1cae57948 100644 --- a/drivers/video/fbdev/hgafb.c +++ b/drivers/video/fbdev/hgafb.c @@ -285,6 +285,8 @@ 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; |