Skip to content

Commit

Permalink
tty/vt: don't set font mappings on vc not supporting this
Browse files Browse the repository at this point in the history
commit 9e326f7 upstream.

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: Imre Deak <imre.deak@intel.com>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Imre Deak authored and Greg Kroah-Hartman committed Sep 21, 2015
1 parent c66fb5c commit 8af4352
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/tty/vt/consolemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;

if (!p) {
err = -EINVAL;

goto out_unlock;
}
if (p->readonly) {
console_unlock();
return -EIO;
Expand Down Expand Up @@ -633,6 +639,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;
}
Expand Down

0 comments on commit 8af4352

Please sign in to comment.