[ 19/63] fbcon: when font is freed, clear also vc_font.data

From: Greg Kroah-Hartman
Date: Mon May 06 2013 - 20:01:47 EST


3.4-stable review patch. If anyone has any objections, please let me know.

------------------

From: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>

commit e6637d5427d2af9f3f33b95447bfc5347e5ccd85 upstream.

commit ae1287865f5361fa138d4d3b1b6277908b54eac9
Author: Dave Airlie <airlied@xxxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
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();


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/