From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Sep 2015 01:46:21 +0000 (-0700)
Subject: 3.14-stable patches
X-Git-Tag: v3.10.89~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=002ea87ab235ade63657102e89aaa25d774e2fc8;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch
---

diff --git a/queue-3.14/series b/queue-3.14/series
index cffa3d16c23..9f9a686ddc9 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -27,3 +27,4 @@ of-address-don-t-loop-forever-in-of_find_matching_node_by_address.patch
 arm-omap2-dra7-clockdomain-change-l4per2_7xx_clkdm-to-sw_wkup.patch
 drivercore-fix-unregistration-path-of-platform-devices.patch
 hpfs-update-ctime-and-mtime-on-directory-modification.patch
+tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch
diff --git a/queue-3.14/tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch b/queue-3.14/tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch
new file mode 100644
index 00000000000..097dec3ffd9
--- /dev/null
+++ b/queue-3.14/tty-vt-don-t-set-font-mappings-on-vc-not-supporting-this.patch
@@ -0,0 +1,45 @@
+From 9e326f78713a4421fe11afc2ddeac07698fac131 Mon Sep 17 00:00:00 2001
+From: Imre Deak <imre.deak@intel.com>
+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 <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: Sudip Mukherjee <sudip@vectorindia.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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;
+ }