From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751239AbbIMGEC (ORCPT ); Sun, 13 Sep 2015 02:04:02 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:34164 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751055AbbIMGEA (ORCPT ); Sun, 13 Sep 2015 02:04:00 -0400 From: Sudip Mukherjee To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Sudip Mukherjee , Subject: [PATCH] tty/vt: don't set font mappings on vc not supporting this Date: Sun, 13 Sep 2015 11:33:51 +0530 Message-Id: <1442124231-13016-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20150912155506.GE29944@kroah.com> References: <20150912155506.GE29944@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Cc: # 3.14.x Signed-off-by: Sudip Mukherjee --- backporting for the first time so not exactly sure if the format is ok. drivers/tty/vt/consolemap.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index 2978ca5..08d36e4 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -540,6 +540,11 @@ 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 +638,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