lkml.org 
[lkml]   [2014]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 039/121] tty/vt: don't set font mappings on vc not supporting this
    Date
    3.13.11-ckt12 -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>
    [ kamal: backport to 3.13-stable: context ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/tty/vt/consolemap.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
    index 2978ca5..d0a3e23 100644
    --- a/drivers/tty/vt/consolemap.c
    +++ b/drivers/tty/vt/consolemap.c
    @@ -540,6 +540,13 @@ 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;
    @@ -633,6 +640,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;
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-12-02 21:02    [W:2.869 / U:1.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site