Skip to content

Commit 18365eb

Browse files
sthibaulgregkh
authored andcommitted
tty: vt: protect KD_FONT_OP_GET_TALL from unbound access
In ioctl(KD_FONT_OP_GET_TALL), userland tells through op->height which vpitch should be used to copy over the font. In con_font_get, we were not checking that it is within the maximum height value, and thus userland could make the vc->vc_sw->con_font_get(vc, &font, vpitch); call possibly overflow the allocated max_font_size bytes, and the copy_to_user(op->data, font.data, c) call possibly read out of that allocated buffer. By checking vpitch against max_font_height, the max_font_size buffer will always be large enough for the vc->vc_sw->con_font_get(vc, &font, vpitch) call (since we already prevent loading a font larger than that), and c = (font.width+7)/8 * vpitch * font.charcount will always remain below max_font_size. Fixes: 24d6938 ("VT: Add KD_FONT_OP_SET/GET_TALL operations") Reported-by: [email protected] Signed-off-by: Samuel Thibault <[email protected]> Reviewed-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/20230306094921.tik5ewne4ft6mfpo@begin Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b6a7bac commit 18365eb

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/tty/vt/vt.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4545,6 +4545,9 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
45454545
int c;
45464546
unsigned int vpitch = op->op == KD_FONT_OP_GET_TALL ? op->height : 32;
45474547

4548+
if (vpitch > max_font_height)
4549+
return -EINVAL;
4550+
45484551
if (op->data) {
45494552
font.data = kvmalloc(max_font_size, GFP_KERNEL);
45504553
if (!font.data)

0 commit comments

Comments
 (0)