projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d06d0b3
)
drivers: video: fbcon: fix NULL dereference in fbcon_cursor()
author
Du Cheng
<ducheng2@gmail.com>
Fri, 12 Mar 2021 08:14:21 +0000
(16:14 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 7 Apr 2021 13:00:13 +0000
(15:00 +0200)
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>
drivers/video/fbdev/core/fbcon.c
patch
|
blob
|
history
diff --git
a/drivers/video/fbdev/core/fbcon.c
b/drivers/video/fbdev/core/fbcon.c
index
8d1ae97
..
2658119
100644
(file)
--- a/
drivers/video/fbdev/core/fbcon.c
+++ b/
drivers/video/fbdev/core/fbcon.c
@@
-1344,6
+1344,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));
}