tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

font: Try opening fonts from the bundled memdisk

Browse Source 
GRUB since 93a786a00 (kern/efi/sb: Enforce verification of font files)
has enforced verification of font files in secure boot mode. In order to
continue to be able to load some default fonts, vendors may bundle them
with their signed EFI image by adding them to the built-in memdisk.

This change makes the font loader try loading fonts from the memdisk
before the prefix path when attempting to load a font file by specifying
its filename, which avoids having to make changes to GRUB configurations
in order to accommodate memdisk bundled fonts. It expects the directory
structure to be the same as fonts stored in the prefix path,
i.e. /fonts/<name>.pf2.

Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
Reviewed-by: Steve McIntyre <93sam@debian.org>
Tested-by: Steve McIntyre <93sam@debian.org>
Reviewed-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Chris Coulson 2023-04-26 12:06:52 +02:00 committed by Daniel Kiper
parent 26cfaa8a90
commit cfc890606b
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
grub-core/font/font.c
View File

@ -415,6 +415,27 @@ read_section_as_short (struct font_file_section *section,
return 0; return 0;
} }
static grub_file_t
try_open_from_prefix (const char *prefix, const char *filename)
{
grub_file_t file;
char *fullname, *ptr;
fullname = grub_malloc (grub_strlen (prefix) + grub_strlen (filename) + 1
+ sizeof ("/fonts/") + sizeof (".pf2"));
if (!fullname)
return NULL;
ptr = grub_stpcpy (fullname, prefix);
ptr = grub_stpcpy (ptr, "/fonts/");
ptr = grub_stpcpy (ptr, filename);
ptr = grub_stpcpy (ptr, ".pf2");
*ptr = '\0';
file = grub_buffile_open (fullname, GRUB_FILE_TYPE_FONT, 1024);
grub_free (fullname);
return file;
}
/* Load a font and add it to the beginning of the global font list. /* Load a font and add it to the beginning of the global font list.
Returns 0 upon success, nonzero upon failure. */ Returns 0 upon success, nonzero upon failure. */
grub_font_t grub_font_t
@ -432,26 +453,19 @@ grub_font_load (const char *filename)
if (filename[0] == '(' || filename[0] == '/' || filename[0] == '+') if (filename[0] == '(' || filename[0] == '/' || filename[0] == '+')
file = grub_buffile_open (filename, GRUB_FILE_TYPE_FONT, 1024); file = grub_buffile_open (filename, GRUB_FILE_TYPE_FONT, 1024);
else else
{
file = try_open_from_prefix ("(memdisk)", filename);
if (!file)
{ {
const char *prefix = grub_env_get ("prefix"); const char *prefix = grub_env_get ("prefix");
char *fullname, *ptr;
if (!prefix) if (!prefix)
{ {
grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("variable `%s' isn't set"), "prefix");
"prefix");
goto fail; goto fail;
} }
fullname = grub_malloc (grub_strlen (prefix) + grub_strlen (filename) + 1 file = try_open_from_prefix (prefix, filename);
+ sizeof ("/fonts/") + sizeof (".pf2")); }
if (!fullname)
goto fail;
ptr = grub_stpcpy (fullname, prefix);
ptr = grub_stpcpy (ptr, "/fonts/");
ptr = grub_stpcpy (ptr, filename);
ptr = grub_stpcpy (ptr, ".pf2");
*ptr = 0;
file = grub_buffile_open (fullname, GRUB_FILE_TYPE_FONT, 1024);
grub_free (fullname);
} }
if (!file) if (!file)
goto fail; goto fail;