summaryrefslogtreecommitdiff
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2022-06-07 13:49:21 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-10 14:37:01 +0300
commit32bd78fc4948471be2853ba8b5229e4e1327e13e (patch)
tree69799edc147ebab7d2f2c3630f50175787be9bb5 /drivers/tty/vt
parent9254365443f72838a276bb2d9a9935c802e3adc8 (diff)
downloadlinux-32bd78fc4948471be2853ba8b5229e4e1327e13e.tar.xz
tty/vt: consolemap: zero uni_pgdir using kcalloc()
The newly allocated p->uni_pgdir[n] is initialized to NULLs right after a kmalloc_array() allocation. Combine these two using kcalloc(). 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-11-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/consolemap.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index e5fd225e87bd..097ab7d01f8b 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -499,18 +499,16 @@ static int con_unify_unimap(struct vc_data *conp, struct uni_pagedict *p)
static int
con_insert_unipair(struct uni_pagedict *p, u_short unicode, u_short fontpos)
{
- int i, n;
+ int n;
u16 **p1, *p2;
n = UNI_DIR(unicode);
p1 = p->uni_pgdir[n];
if (!p1) {
- p1 = p->uni_pgdir[n] = kmalloc_array(UNI_DIR_ROWS,
- sizeof(u16 *), GFP_KERNEL);
+ p1 = p->uni_pgdir[n] = kcalloc(UNI_DIR_ROWS, sizeof(u16 *),
+ GFP_KERNEL);
if (!p1)
return -ENOMEM;
- for (i = 0; i < UNI_DIR_ROWS; i++)
- p1[i] = NULL;
}
n = UNI_ROW(unicode);