From: Jiri Slaby <jsl...@suse.cz>

[ 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 <jsl...@suse.cz>
Link: https://lore.kernel.org/r/20210105120239.28031-7-jsl...@suse.cz
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/tty/vt/consolemap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 7c7ada0b3ea0..90c6e10b1ef9 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;
 }
-- 
2.30.1



Reply via email to