diff options
| author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2013-04-22 13:19:26 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-04-24 02:43:11 +0200 |
| commit | e6637d5427d2af9f3f33b95447bfc5347e5ccd85 (patch) | |
| tree | 1864961c00e7eb248316656d9e74cd4a7a44927c | |
| parent | Merge branch 'drm-next-3.10-2' of git://people.freedesktop.org/~agd5f/linux i... (diff) | |
| download | linux-e6637d5427d2af9f3f33b95447bfc5347e5ccd85.tar.xz linux-e6637d5427d2af9f3f33b95447bfc5347e5ccd85.zip | |
fbcon: when font is freed, clear also vc_font.data
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>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/video/console/fbcon.c | 2 |
1 files changed, 2 insertions, 0 deletions
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(); |