Patchwork [3.5.y.z,extended,stable] Patch "fbcon: when font is freed, clear also vc_font.data" has been added to staging queue

login
register
mail settings
Submitter Luis Henriques
Date May 15, 2013, 10:33 a.m.
Message ID <1368614014-23734-1-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/243988/
State New
Headers show

Comments

Luis Henriques - May 15, 2013, 10:33 a.m.
This is a note to let you know that I have just added a patch titled

    fbcon: when font is freed, clear also vc_font.data

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

From e2d885c70ef1085bf6c9cd7c401c44fe7bfd44f5 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: [PATCH] fbcon: when font is freed, clear also vc_font.data

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: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/video/console/fbcon.c | 2 ++
 1 file changed, 2 insertions(+)

--
1.8.1.2

Patch

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 18ded2d..a01317c 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();