From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 3 May 2013 03:52:03 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.77~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=522f2ff255f8f6fbf0bfab4532b1c92abfc61a40;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	fbcon-when-font-is-freed-clear-also-vc_font.data.patch
---

diff --git a/queue-3.0/fbcon-when-font-is-freed-clear-also-vc_font.data.patch b/queue-3.0/fbcon-when-font-is-freed-clear-also-vc_font.data.patch
new file mode 100644
index 00000000000..aa7e7639fc4
--- /dev/null
+++ b/queue-3.0/fbcon-when-font-is-freed-clear-also-vc_font.data.patch
@@ -0,0 +1,39 @@
+From e6637d5427d2af9f3f33b95447bfc5347e5ccd85 Mon Sep 17 00:00:00 2001
+From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+Date: Mon, 22 Apr 2013 14:19:26 +0300
+Subject: fbcon: when font is freed, clear also vc_font.data
+
+From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+
+commit e6637d5427d2af9f3f33b95447bfc5347e5ccd85 upstream.
+
+commit ae1287865f5361fa138d4d3b1b6277908b54eac9
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Jan 24 16:12:41 2013 +1000
+
+    fbcon: don't lose the console font across generic->chip driver switch
+
+uses a pointer in vc->vc_font.data to load font into the new driver.
+However if the font is actually freed, we need to clear the data
+so that we don't reload font from dangling pointer.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=892340
+Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/video/console/fbcon.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/video/console/fbcon.c
++++ b/drivers/video/console/fbcon.c
+@@ -1229,6 +1229,8 @@ static void fbcon_deinit(struct vc_data
+ finished:
+ 
+ 	fbcon_free_font(p, free_font);
++	if (free_font)
++		vc->vc_font.data = NULL;
+ 
+ 	if (!con_is_bound(&fb_con))
+ 		fbcon_exit();
diff --git a/queue-3.0/series b/queue-3.0/series
index e0181108ac7..37b1aaff7c2 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -11,3 +11,4 @@ s390-memory-hotplug-prevent-offline-of-active-memory-increments.patch
 xen-time-fix-kasprintf-splat-when-allocating-timer-d-irq-line.patch
 serial_core.c-add-put_device-after-device_find_child.patch
 tty-fix-up-atime-mtime-mess-take-three.patch
+fbcon-when-font-is-freed-clear-also-vc_font.data.patch