mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
fbcon: when font is freed, clear also vc_font.data
commite6637d5427
upstream. commitae1287865f
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>
This commit is contained in:
parent
ce5b62fd94
commit
a393520aa6
1 changed files with 2 additions and 0 deletions
|
@ -1228,6 +1228,8 @@ static void fbcon_deinit(struct vc_data *vc)
|
|||
finished:
|
||||
|
||||
fbcon_free_font(p, free_font);
|
||||
if (free_font)
|
||||
vc->vc_font.data = NULL;
|
||||
|
||||
if (!con_is_bound(&fb_con))
|
||||
fbcon_exit();
|
||||
|
|
Loading…
Reference in a new issue