From: Mika Kuoppala Date: Mon, 22 Apr 2013 11:19:26 +0000 (+0300) Subject: fbcon: when font is freed, clear also vc_font.data X-Git-Tag: MMI-PSA29.97-13-9~14364^2~56 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e6637d5427d2af9f3f33b95447bfc5347e5ccd85;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git fbcon: when font is freed, clear also vc_font.data 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 Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie --- diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 3cd675927826..a92783e480e6 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -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();