From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Imre Deak , Greg Kroah-Hartman , Zefan Li Subject: [PATCH 3.4 142/177] tty/vt: don't set font mappings on vc not supporting this Date: Wed, 28 Jan 2015 12:10:00 +0800 Message-Id: <1422418236-12852-233-git-send-email-lizf@kernel.org> In-Reply-To: <1422418050-12581-1-git-send-email-lizf@kernel.org> References: <1422418050-12581-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Imre Deak 3.4.106-rc1 review patch. If anyone has any objections, please let me know. ------------------ 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: Greg Kroah-Hartman [lizf: Backported to 3.4: just return -EINVAL as we don't need to unlock] Signed-off-by: Zefan Li --- drivers/tty/vt/consolemap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index 8308fc7..87025d0 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -518,6 +518,10 @@ 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) + return -EINVAL; + if (p->readonly) return -EIO; if (!ct) return 0; -- 1.9.1