upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vt: panic while changing vt font

Browse source 
Set refcount for loader provided font to 1 to prevent this font
from being released (so we can reset to default).

As we get started with no memory allocator, we set up static font data
for font passed by loader (if there is any). At this time, we also must
set refcount 1, and refcount will get incremented in cnprobe() callback.

At some point the memory allocator will be available, and we will set up
properly allocated font data, but we should not disturb the refcount.

PR: 252833
PR: 253147

(cherry picked and squashed 93ebd6307e and
1912d2b15e)
This commit is contained in:
Toomas Soome 2021-01-24 20:59:36 +02:00
parent 0d381d1b92
commit b79f2bc6c5
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/dev/vt/vt_core.c
View file

@ -1487,6 +1487,8 @@ parse_font_info_static(struct font_info *fi)
vfp = &vt_font_loader;
vfp->vf_height = fi->fi_height;
vfp->vf_width = fi->fi_width;
/* This is default font, set refcount 1 to disable removal. */
vfp->vf_refcount = 1;
for (unsigned i = 0; i < VFNT_MAPS; i++) {
if (fi->fi_map_count[i] == 0)
continue;
@ -1499,6 +1501,12 @@ parse_font_info_static(struct font_info *fi)
return (vfp);
}
/*
* Set up default font with allocated data structures.
* However, we can not set refcount here, because it is already set and
* incremented in vtterm_cnprobe() to avoid being released by font load from
* userland.
*/
static struct vt_font *
parse_font_info(struct font_info *fi)
{