| From: Mika Kuoppala <mika.kuoppala@linux.intel.com> |
| Date: Mon, 22 Apr 2013 14:19:26 +0300 |
| Subject: 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: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/video/console/fbcon.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/video/console/fbcon.c |
| +++ b/drivers/video/console/fbcon.c |
| @@ -1229,6 +1229,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(); |