From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54089 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755961AbbIUEhh (ORCPT ); Mon, 21 Sep 2015 00:37:37 -0400 Subject: Patch "tty/vt: don't set font mappings on vc not supporting this" has been added to the 3.14-stable tree To: imre.deak@intel.com, gregkh@linuxfoundation.org, sudip@vectorindia.org Cc: , From: Date: Sun, 20 Sep 2015 18:46:22 -0700 Message-ID: <1442799982198128@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled tty/vt: don't set font mappings on vc not supporting this to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 9e326f78713a4421fe11afc2ddeac07698fac131 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Thu, 2 Oct 2014 16:34:31 +0300 Subject: tty/vt: don't set font mappings on vc not supporting this From: Imre Deak 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 Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- drivers/tty/vt/consolemap.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -540,6 +540,12 @@ int con_set_unimap(struct vc_data *vc, u /* 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 +639,7 @@ int con_set_unimap(struct vc_data *vc, u set_inverse_transl(vc, p, i); /* Update inverse translations */ set_inverse_trans_unicode(vc, p); +out_unlock: console_unlock(); return err; } Patches currently in stable-queue which might be from imre.deak@intel.com are queue-3.14/tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch