tty/vt: consolemap: use ARRAY_SIZE(), part II.

The code still uses constants (macros) as bounds in loops after commit
11693f7641be (tty/vt: consolemap: use ARRAY_SIZE()). The contants are at
least macros used also in the definition of the arrays. But use
ARRAY_SIZE() on two more places to ensure the loops never run out of
bounds even if the array definition change.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220614090537.15557-1-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index fff97ae87e00e0f3a308044c14bb571bcf452f47..2039237b5266e19923233ced41804751b9d8428b 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -232,7 +232,7 @@ static void set_inverse_transl(struct vc_data *conp, struct uni_pagedict *p,
        }
        memset(q, 0, MAX_GLYPH);
 
-       for (j = 0; j < E_TABSZ; j++) {
+       for (j = 0; j < ARRAY_SIZE(translations[m]); j++) {
                glyph = conv_uni_to_pc(conp, t[j]);
                if (glyph >= 0 && glyph < MAX_GLYPH && q[glyph] < 32) {
                        /* prefer '-' above SHY etc. */
@@ -367,7 +367,7 @@ int con_get_trans_old(unsigned char __user * arg)
        unsigned char outbuf[E_TABSZ];
 
        console_lock();
-       for (i = 0; i < E_TABSZ ; i++)
+       for (i = 0; i < ARRAY_SIZE(outbuf); i++)
        {
                ch = conv_uni_to_pc(vc_cons[fg_console].d, p[i]);
                outbuf[i] = (ch & ~0xff) ? 0 : ch;