diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2022-06-07 12:49:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-10 13:37:03 +0200 |
| commit | 484923ad3ad1604efa666502ac507b1e3ee30e3b (patch) | |
| tree | 1b6abb9562adf2d05a1a7b1b0a20826394fb31c5 /drivers/tty/vt/consolemap.c | |
| parent | fc440658346e1bff9b6661467f55856d1df1cdb2 (diff) | |
| download | linux-484923ad3ad1604efa666502ac507b1e3ee30e3b.tar.gz linux-484923ad3ad1604efa666502ac507b1e3ee30e3b.tar.bz2 linux-484923ad3ad1604efa666502ac507b1e3ee30e3b.zip | |
tty/vt: consolemap: walk the buffer only once in con_set_trans_old()
Fetch the user data one by one (by get_user()) and fill in the local
buffer simultaneously. I.e. we no longer require to walk two buffers and
save thus 256 B from stack (whole ubuf).
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-36-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt/consolemap.c')
| -rw-r--r-- | drivers/tty/vt/consolemap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index f97f7ee6268b..fff97ae87e00 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -343,15 +343,15 @@ static void update_user_maps(void) */ int con_set_trans_old(unsigned char __user * arg) { - int i; unsigned short inbuf[E_TABSZ]; - unsigned char ubuf[E_TABSZ]; - - if (copy_from_user(ubuf, arg, E_TABSZ)) - return -EFAULT; + unsigned int i; + unsigned char ch; - for (i = 0; i < E_TABSZ ; i++) - inbuf[i] = UNI_DIRECT_BASE | ubuf[i]; + for (i = 0; i < ARRAY_SIZE(inbuf); i++) { + if (get_user(ch, &arg[i])) + return -EFAULT; + inbuf[i] = UNI_DIRECT_BASE | ch; + } console_lock(); memcpy(translations[USER_MAP], inbuf, sizeof(inbuf)); |