Skip to content

Commit 63c5b11

Browse files
vt: keyboard: avoid signed integer overflow in k_ascii
jira VULN-7723 cve CVE-2020-13974 commit-author Dmitry Torokhov <dmitry.torokhov@gmail.com> commit b86dab0 When k_ascii is invoked several times in a row there is a potential for signed integer overflow: UBSAN: Undefined behaviour in drivers/tty/vt/keyboard.c:888:19 signed integer overflow: 10 * 1111111111 cannot be represented in type 'int' CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.6.11 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xce/0x128 lib/dump_stack.c:118 ubsan_epilogue+0xe/0x30 lib/ubsan.c:154 handle_overflow+0xdc/0xf0 lib/ubsan.c:184 __ubsan_handle_mul_overflow+0x2a/0x40 lib/ubsan.c:205 k_ascii+0xbf/0xd0 drivers/tty/vt/keyboard.c:888 kbd_keycode drivers/tty/vt/keyboard.c:1477 [inline] kbd_event+0x888/0x3be0 drivers/tty/vt/keyboard.c:1495 While it can be worked around by using check_mul_overflow()/ check_add_overflow(), it is better to introduce a separate flag to signal that number pad is being used to compose a symbol, and change type of the accumulator from signed to unsigned, thus avoiding undefined behavior when it overflows. Reported-by: Kyungtae Kim <kt0755@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200525232740.GA262061@dtor-ws Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit b86dab0) Signed-off-by: Pratham Patel <ppatel@ciq.com>
1 parent c3ea26a commit 63c5b11

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

drivers/tty/vt/keyboard.c

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ static DEFINE_SPINLOCK(func_buf_lock); /* guard 'func_buf' and friends */
126126
static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)]; /* keyboard key bitmap */
127127
static unsigned char shift_down[NR_SHIFT]; /* shift state counters.. */
128128
static bool dead_key_next;
129-
static int npadch = -1; /* -1 or number assembled on pad */
129+
130+
/* Handles a number being assembled on the number pad */
131+
static bool npadch_active;
132+
static unsigned int npadch_value;
133+
130134
static unsigned int diacr;
131135
static char rep; /* flag telling character repeat */
132136

@@ -839,12 +843,12 @@ static void k_shift(struct vc_data *vc, unsigned char value, char up_flag)
839843
shift_state &= ~(1 << value);
840844

841845
/* kludge */
842-
if (up_flag && shift_state != old_state && npadch != -1) {
846+
if (up_flag && shift_state != old_state && npadch_active) {
843847
if (kbd->kbdmode == VC_UNICODE)
844-
to_utf8(vc, npadch);
848+
to_utf8(vc, npadch_value);
845849
else
846-
put_queue(vc, npadch & 0xff);
847-
npadch = -1;
850+
put_queue(vc, npadch_value & 0xff);
851+
npadch_active = false;
848852
}
849853
}
850854

@@ -862,7 +866,7 @@ static void k_meta(struct vc_data *vc, unsigned char value, char up_flag)
862866

863867
static void k_ascii(struct vc_data *vc, unsigned char value, char up_flag)
864868
{
865-
int base;
869+
unsigned int base;
866870

867871
if (up_flag)
868872
return;
@@ -876,10 +880,12 @@ static void k_ascii(struct vc_data *vc, unsigned char value, char up_flag)
876880
base = 16;
877881
}
878882

879-
if (npadch == -1)
880-
npadch = value;
881-
else
882-
npadch = npadch * base + value;
883+
if (!npadch_active) {
884+
npadch_value = 0;
885+
npadch_active = true;
886+
}
887+
888+
npadch_value = npadch_value * base + value;
883889
}
884890

885891
static void k_lock(struct vc_data *vc, unsigned char value, char up_flag)

0 commit comments

Comments
 (0)