summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDu Cheng <ducheng2@gmail.com>2021-03-12 16:14:21 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-07 12:48:51 +0200
commit5369cc42ab21a93cbc9a8f3f8c7a004bbe023178 (patch)
tree167655d2805c0634b5e8b376f9d00df469a82cbc
parent7eb9eb82fc0287810ea23f5f84c40e7e4701b11f (diff)
drivers: video: fbcon: fix NULL dereference in fbcon_cursor()
commit 01faae5193d6190b7b3aa93dae43f514e866d652 upstream. add null-check on function pointer before dereference on ops->cursor Reported-by: syzbot+b67aaae8d3a927f68d20@syzkaller.appspotmail.com Cc: stable <stable@vger.kernel.org> Signed-off-by: Du Cheng <ducheng2@gmail.com> Link: https://lore.kernel.org/r/20210312081421.452405-1-ducheng2@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/video/fbdev/core/fbcon.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 5742a0dc774e..cf0e025416e5 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -1306,6 +1306,9 @@ static void fbcon_cursor(struct vc_data *vc, int mode)
ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1;
+ if (!ops->cursor)
+ return;
+
ops->cursor(vc, info, mode, get_color(vc, info, c, 1),
get_color(vc, info, c, 0));
}