lkml.org 
[lkml]   [2014]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 041/254] tty/vt: don't set font mappings on vc not supporting this
    Date
    3.16.7-ckt2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Imre Deak <imre.deak@intel.com>

    commit 9e326f78713a4421fe11afc2ddeac07698fac131 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/tty/vt/consolemap.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
    index 610b720d3b91..59b25e039968 100644
    --- a/drivers/tty/vt/consolemap.c
    +++ b/drivers/tty/vt/consolemap.c
    @@ -539,6 +539,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;
    @@ -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;
    }
    --
    2.1.0


    \
     
     \ /
      Last update: 2014-11-25 13:21    [W:4.122 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site