summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2021-01-05 13:02:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-07 16:17:31 +0100
commit9777f8e60e718f7b022a94f2524f967d8def1931 (patch)
treef3d8d6401c297cbd394ef0402a2632286710a070 /drivers/tty
parent7d7dec450a66009a4738cc538e59fb507fdb9ebe (diff)
downloadlinux-stable-9777f8e60e718f7b022a94f2524f967d8def1931.tar.gz
linux-stable-9777f8e60e718f7b022a94f2524f967d8def1931.tar.bz2
linux-stable-9777f8e60e718f7b022a94f2524f967d8def1931.zip
vt/consolemap: do font sum unsigned
The constant 20 makes the font sum computation signed which can lead to sign extensions and signed wraps. It's not much of a problem as we build with -fno-strict-overflow. But if we ever decide not to, be ready, so switch the constant to unsigned. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Link: https://lore.kernel.org/r/20210105120239.28031-7-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/vt/consolemap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index f7d015c67963..d815ac98b39e 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -495,7 +495,7 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
p2[unicode & 0x3f] = fontpos;
- p->sum += (fontpos << 20) + unicode;
+ p->sum += (fontpos << 20U) + unicode;
return 0;
}