Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e326f78 authored by Imre Deak's avatar Imre Deak Committed by Greg Kroah-Hartman
Browse files

tty/vt: don't set font mappings on vc not supporting this 

We can call this function for a dummy console that doesn't support
setting the font mapping, which will result in a null ptr BUG. So check
for this case and return error for consoles w/o font mapping support.

Reference: https://bugzilla.kernel.org/show_bug.cgi?id=59321


Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd92208f

drivers/tty/vt/consolemap.c

+7 −0
Original line number Diff line number Diff line
@@ -540,6 +540,12 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list) 
	/* Save original vc_unipagdir_loc in case we allocate a new one */

	p = *vc->vc_uni_pagedir_loc;



	if (!p) {

		err = -EINVAL;



		goto out_unlock;

	}

	

	if (p->refcount > 1) {

		int j, k;

		u16 **p1, *p2, l;
@@ -623,6 +629,7 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list) 
		set_inverse_transl(vc, p, i); /* Update inverse translations */

	set_inverse_trans_unicode(vc, p);



out_unlock:

	console_unlock();

	return err;

}