diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2021-01-05 13:02:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-07 12:20:44 +0100 |
| commit | 48549db10dbe3ef5a765a920b8fa11e83a741270 (patch) | |
| tree | 2020f5bfe69afc18756b6fc7acead796cde34eb4 /drivers/tty | |
| parent | de00b8f037ca683c8ddd4cd52a7cf1f157afa3eb (diff) | |
| download | linux-stable-48549db10dbe3ef5a765a920b8fa11e83a741270.tar.gz linux-stable-48549db10dbe3ef5a765a920b8fa11e83a741270.tar.bz2 linux-stable-48549db10dbe3ef5a765a920b8fa11e83a741270.zip | |
vt/consolemap: do font sum unsigned
[ Upstream commit 9777f8e60e718f7b022a94f2524f967d8def1931 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/vt/consolemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index b28aa0d289f8..251c02af1fc3 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; } |