From 0a5069d1fe530d25ea801ec74d3b0cc057c93fd7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 May 2013 20:52:07 -0700 Subject: [PATCH] 3.4-stable patches added patches: fbcon-when-font-is-freed-clear-also-vc_font.data.patch --- ...ont-is-freed-clear-also-vc_font.data.patch | 39 +++++++++++++++++++ queue-3.4/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-3.4/fbcon-when-font-is-freed-clear-also-vc_font.data.patch diff --git a/queue-3.4/fbcon-when-font-is-freed-clear-also-vc_font.data.patch b/queue-3.4/fbcon-when-font-is-freed-clear-also-vc_font.data.patch new file mode 100644 index 00000000000..7818c0db65c --- /dev/null +++ b/queue-3.4/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 +Date: Mon, 22 Apr 2013 14:19:26 +0300 +Subject: fbcon: when font is freed, clear also vc_font.data + +From: Mika Kuoppala + +commit e6637d5427d2af9f3f33b95447bfc5347e5ccd85 upstream. + +commit ae1287865f5361fa138d4d3b1b6277908b54eac9 +Author: Dave Airlie +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 +Signed-off-by: Dave Airlie +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/console/fbcon.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/video/console/fbcon.c ++++ b/drivers/video/console/fbcon.c +@@ -1228,6 +1228,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.4/series b/queue-3.4/series index c5cee182e7a..4871264071d 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -16,3 +16,4 @@ serial_core.c-add-put_device-after-device_find_child.patch arm-set-the-page-table-freeing-ceiling-to-task_size.patch gianfar-do-not-advertise-any-alarm-capability.patch tty-fix-up-atime-mtime-mess-take-three.patch +fbcon-when-font-is-freed-clear-also-vc_font.data.patch -- 2.47.3