Skip to content

[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] fbdev: bitblit: fix bound-check glyph index in bit_putcs for cjktty #1398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opsiff wants to merge 1 commit into
base: linux-6.6.y
Choose a base branch
from
+11 −11
Open

[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] fbdev: bitblit: fix bound-check glyph index in bit_putcs for cjktty #1398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions drivers/video/fbdev/core/bitblit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ u8 *font_bits(struct vc_data *vc, const u16 *s, u32 cellsize, u16 charmask,
u16 ch = scr_readw(s) & charmask;
const struct font_desc *font;

fontdata = ops ? ops->fontbuffer : vc->vc_font.data;
if (ch == 0xff || ch == 0xfe) {
/* assume current font not support unicode */
if (charcnt < 65536) {
Expand All @@ -75,22 +76,21 @@ u8 *font_bits(struct vc_data *vc, const u16 *s, u32 cellsize, u16 charmask,
font = find_font(fontname);
fontdata = (font && font->data) ? (void *) font->data : NULL;
}
if (fontdata) {
c_utf = utf8_pos(vc, s);
if (ch == 0xff)
src = fontdata + (c_utf * cellsize_utf * 2);
else
src = fontdata + (c_utf * cellsize_utf * 2 + cellsize_utf);
return src;
}
/* ch=0 for fontdata=0 */
ch = 0;
}
if (fontdata) {
c_utf = utf8_pos(vc, s);
if (ch == 0xff)
src = fontdata + (c_utf * cellsize_utf * 2);
else
src = fontdata + (c_utf * cellsize_utf * 2 + cellsize_utf);
return src;
}
/* ch=0 for fontdata=0 */
ch = 0;
} else if (ch >= charcnt) {
ch = 0;
}

fontdata = ops ? ops->fontbuffer : vc->vc_font.data;
src = fontdata + (unsigned int)ch * cellsize;
return src;
}
Expand Down
Loading