[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220801154220.186048-1-khalid.masum.92@gmail.com>
Date: Mon, 1 Aug 2022 21:42:20 +0600
From: Khalid Masum <khalid.masum.92@...il.com>
To: deller@....de
Cc: linux-kernel@...r.kernel.org, syzkaller-bugs@...glegroups.com,
dan.carpenter@...cle.com,
syzbot+14b0e8f3fd1612e35350@...kaller.appspotmail.com,
Khalid Masum <khalid.masum.92@...il.com>
Subject: Re: [syzbot] KASAN: vmalloc-out-of-bounds Write in imageblit (2)
#syz test: https://github.com/torvalds/linux.git 3d7cb6b04c3f
---
drivers/video/fbdev/core/fbcon.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 1a9aa12cf886..d026f3845b60 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -2591,14 +2591,13 @@ static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,
{
unsigned long ret;
int x, y;
+ unsigned long offset = (pos - vc->vc_origin) / 2;
+ x = offset % vc->vc_cols;
+ y = offset / vc->vc_cols;
+ ret = pos + (vc->vc_cols - x) * 2;
- if (pos >= vc->vc_origin && pos < vc->vc_scr_end) {
- unsigned long offset = (pos - vc->vc_origin) / 2;
-
- x = offset % vc->vc_cols;
- y = offset / vc->vc_cols;
- ret = pos + (vc->vc_cols - x) * 2;
- } else {
+ if (pos < vc->vc_origin || pos >= vc->vc_scr_end ||
+ ret >= vc->vc_scr_end) {
/* Should not happen */
x = y = 0;
ret = vc->vc_origin;
--
2.36.1
Powered by blists - more mailing lists