Add LZSS Mach-O support (needed for new xnu kernelcache).
* grub-core/Makefile.core.def (xnu): Add file lzss.c * grub-core/loader/lzss.c: New file. * grub-core/loader/xnu.c (grub_xnu_load_driver): Close binaryfile on Mach-O open failure. * grub-core/loader/macho.c (grub_macho_close): Free uncompressedXX. Don't free cmdsXX in uncompressedXX is set. (grub_macho_file): Init new fields. New argument is_64bit. All users updated. Handle compressed. Error out if no suitable architecture is found. Don't close file. (grub_macho_open): New argument is_64bit. All users updated. * grub-core/loader/macho32.c: Add defines for new fields. * grub-core/loader/macho64.c: Likewise. * grub-core/loader/machoXX.c (grub_macho_contains_macho): Make static. (grub_macho_parse): Handle compressed. Defer actual processing if compressed. (grub_macho_cmds_iterate): Decompress if compressed. New argument "filename". All users updated. (grub_macho_size): New argument "filename". All users updated. (grub_macho_get_entry_point): Likewise. (grub_macho_load): Handle compressed. * include/grub/macho.h (grub_macho_lzss_header): New struct. (GRUB_MACHO_LZSS_OFFSET): New define. (grub_decompress_lzss): New proto. * include/grub/machoload.h (grub_macho_file): New fields to handle compressed. (grub_macho_contains_macho64): Remove proto. (grub_macho_contains_macho32): Likewise. * util/grub.d/30_os-prober.in: Use kernel cache if available.
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
ebd17d6f51
commit
99ce1597a4
11 changed files with 339 additions and 80 deletions
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
||||
|
||||
int
|
||||
static int
|
||||
SUFFIX (grub_macho_contains_macho) (grub_macho_t macho)
|
||||
{
|
||||
return macho->offsetXX != -1;
|
||||
|
|
@ -15,16 +15,19 @@ SUFFIX (grub_macho_contains_macho) (grub_macho_t macho)
|
|||
void
|
||||
SUFFIX (grub_macho_parse) (grub_macho_t macho, const char *filename)
|
||||
{
|
||||
grub_macho_header_t head;
|
||||
union {
|
||||
struct grub_macho_lzss_header lzss;
|
||||
grub_macho_header_t macho;
|
||||
} head;
|
||||
|
||||
/* Is there any candidate at all? */
|
||||
if (macho->offsetXX == -1)
|
||||
return;
|
||||
|
||||
/* Read header and check magic*/
|
||||
/* Read header and check magic. */
|
||||
if (grub_file_seek (macho->file, macho->offsetXX) == (grub_off_t) -1
|
||||
|| grub_file_read (macho->file, &head, sizeof (head))
|
||||
!= sizeof(head))
|
||||
!= sizeof (head))
|
||||
{
|
||||
if (!grub_errno)
|
||||
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||
|
|
@ -32,7 +35,25 @@ SUFFIX (grub_macho_parse) (grub_macho_t macho, const char *filename)
|
|||
macho->offsetXX = -1;
|
||||
return;
|
||||
}
|
||||
if (head.magic != GRUB_MACHO_MAGIC)
|
||||
if (grub_memcmp (head.lzss.magic, GRUB_MACHO_LZSS_MAGIC,
|
||||
sizeof (head.lzss.magic)) == 0)
|
||||
{
|
||||
macho->compressed_sizeXX = grub_be_to_cpu32 (head.lzss.compressed_size);
|
||||
macho->uncompressed_sizeXX
|
||||
= grub_be_to_cpu32 (head.lzss.uncompressed_size);
|
||||
if (macho->uncompressed_sizeXX < sizeof (head.macho))
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||
filename);
|
||||
macho->offsetXX = -1;
|
||||
return;
|
||||
}
|
||||
/* Skip header check. */
|
||||
macho->compressedXX = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
if (head.macho.magic != GRUB_MACHO_MAGIC)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_OS, "invalid Mach-O " XX "-bit header");
|
||||
macho->offsetXX = -1;
|
||||
|
|
@ -40,12 +61,14 @@ SUFFIX (grub_macho_parse) (grub_macho_t macho, const char *filename)
|
|||
}
|
||||
|
||||
/* Read commands. */
|
||||
macho->ncmdsXX = head.ncmds;
|
||||
macho->cmdsizeXX = head.sizeofcmds;
|
||||
macho->cmdsXX = grub_malloc(macho->cmdsizeXX);
|
||||
macho->ncmdsXX = head.macho.ncmds;
|
||||
macho->cmdsizeXX = head.macho.sizeofcmds;
|
||||
macho->cmdsXX = grub_malloc (macho->cmdsizeXX);
|
||||
if (! macho->cmdsXX)
|
||||
return;
|
||||
if (grub_file_read (macho->file, macho->cmdsXX,
|
||||
if (grub_file_seek (macho->file, macho->offsetXX
|
||||
+ sizeof (grub_macho_header_t)) == (grub_off_t) -1
|
||||
|| grub_file_read (macho->file, macho->cmdsXX,
|
||||
(grub_size_t) macho->cmdsizeXX)
|
||||
!= (grub_ssize_t) macho->cmdsizeXX)
|
||||
{
|
||||
|
|
@ -63,12 +86,76 @@ typedef int NESTED_FUNC_ATTR (*grub_macho_iter_hook_t)
|
|||
static grub_err_t
|
||||
grub_macho_cmds_iterate (grub_macho_t macho,
|
||||
grub_macho_iter_hook_t hook,
|
||||
void *hook_arg)
|
||||
void *hook_arg,
|
||||
const char *filename)
|
||||
{
|
||||
grub_uint8_t *hdrs = macho->cmdsXX;
|
||||
grub_uint8_t *hdrs;
|
||||
int i;
|
||||
|
||||
if (macho->compressedXX && !macho->uncompressedXX)
|
||||
{
|
||||
grub_uint8_t *tmp;
|
||||
grub_macho_header_t *head;
|
||||
macho->uncompressedXX = grub_malloc (macho->uncompressed_sizeXX);
|
||||
if (!macho->uncompressedXX)
|
||||
return grub_errno;
|
||||
tmp = grub_malloc (macho->compressed_sizeXX);
|
||||
if (!tmp)
|
||||
{
|
||||
grub_free (macho->uncompressedXX);
|
||||
macho->uncompressedXX = 0;
|
||||
return grub_errno;
|
||||
}
|
||||
if (grub_file_seek (macho->file, macho->offsetXX
|
||||
+ GRUB_MACHO_LZSS_OFFSET) == (grub_off_t) -1
|
||||
|| grub_file_read (macho->file, tmp,
|
||||
(grub_size_t) macho->compressed_sizeXX)
|
||||
!= (grub_ssize_t) macho->compressed_sizeXX)
|
||||
{
|
||||
if (!grub_errno)
|
||||
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||
filename);
|
||||
grub_free (tmp);
|
||||
grub_free (macho->uncompressedXX);
|
||||
macho->uncompressedXX = 0;
|
||||
macho->offsetXX = -1;
|
||||
return grub_errno;
|
||||
}
|
||||
if (grub_decompress_lzss (macho->uncompressedXX,
|
||||
macho->uncompressedXX
|
||||
+ macho->uncompressed_sizeXX,
|
||||
tmp, tmp + macho->compressed_sizeXX)
|
||||
!= macho->uncompressed_sizeXX)
|
||||
{
|
||||
if (!grub_errno)
|
||||
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||
filename);
|
||||
grub_free (tmp);
|
||||
grub_free (macho->uncompressedXX);
|
||||
macho->uncompressedXX = 0;
|
||||
macho->offsetXX = -1;
|
||||
return grub_errno;
|
||||
}
|
||||
grub_free (tmp);
|
||||
head = (grub_macho_header_t *) macho->uncompressedXX;
|
||||
macho->ncmdsXX = head->ncmds;
|
||||
macho->cmdsizeXX = head->sizeofcmds;
|
||||
macho->cmdsXX = macho->uncompressedXX + sizeof (grub_macho_header_t);
|
||||
if (sizeof (grub_macho_header_t) + macho->cmdsizeXX
|
||||
>= macho->uncompressed_sizeXX)
|
||||
{
|
||||
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
|
||||
filename);
|
||||
grub_free (macho->uncompressedXX);
|
||||
macho->uncompressedXX = 0;
|
||||
macho->offsetXX = -1;
|
||||
return grub_errno;
|
||||
}
|
||||
}
|
||||
|
||||
if (! macho->cmdsXX)
|
||||
return grub_error (GRUB_ERR_BAD_OS, "couldn't find " XX "-bit Mach-O");
|
||||
hdrs = macho->cmdsXX;
|
||||
for (i = 0; i < macho->ncmdsXX; i++)
|
||||
{
|
||||
struct grub_macho_cmd *hdr = (struct grub_macho_cmd *) hdrs;
|
||||
|
|
@ -116,7 +203,8 @@ SUFFIX (grub_macho_readfile) (grub_macho_t macho,
|
|||
/* Calculate the amount of memory spanned by the segments. */
|
||||
grub_err_t
|
||||
SUFFIX (grub_macho_size) (grub_macho_t macho, grub_macho_addr_t *segments_start,
|
||||
grub_macho_addr_t *segments_end, int flags)
|
||||
grub_macho_addr_t *segments_end, int flags,
|
||||
const char *filename)
|
||||
{
|
||||
int nr_phdrs = 0;
|
||||
|
||||
|
|
@ -149,7 +237,7 @@ SUFFIX (grub_macho_size) (grub_macho_t macho, grub_macho_addr_t *segments_start,
|
|||
*segments_start = (grub_macho_addr_t) -1;
|
||||
*segments_end = 0;
|
||||
|
||||
grub_macho_cmds_iterate (macho, calcsize, 0);
|
||||
grub_macho_cmds_iterate (macho, calcsize, 0, filename);
|
||||
|
||||
if (nr_phdrs == 0)
|
||||
return grub_error (GRUB_ERR_BAD_OS, "no program headers present");
|
||||
|
|
@ -183,16 +271,31 @@ SUFFIX (grub_macho_load) (grub_macho_t macho, const char *filename,
|
|||
if (! hdr->vmsize)
|
||||
return 0;
|
||||
|
||||
if (grub_file_seek (_macho->file, hdr->fileoff
|
||||
+ _macho->offsetXX) == (grub_off_t) -1)
|
||||
return 1;
|
||||
|
||||
if (hdr->filesize)
|
||||
{
|
||||
grub_ssize_t read;
|
||||
read = grub_file_read (_macho->file, offset + hdr->vmaddr,
|
||||
min (hdr->filesize, hdr->vmsize));
|
||||
if (read != (grub_ssize_t) min (hdr->filesize, hdr->vmsize))
|
||||
grub_ssize_t read, toread = min (hdr->filesize, hdr->vmsize);
|
||||
if (macho->uncompressedXX)
|
||||
{
|
||||
if (hdr->fileoff + toread
|
||||
> _macho->uncompressed_sizeXX)
|
||||
read = -1;
|
||||
else
|
||||
{
|
||||
read = toread;
|
||||
grub_memcpy (offset + hdr->vmaddr,
|
||||
_macho->uncompressedXX + hdr->fileoff, read);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (grub_file_seek (_macho->file, hdr->fileoff
|
||||
+ _macho->offsetXX) == (grub_off_t) -1)
|
||||
return 1;
|
||||
read = grub_file_read (_macho->file, offset + hdr->vmaddr,
|
||||
toread);
|
||||
}
|
||||
|
||||
if (read != toread)
|
||||
{
|
||||
/* XXX How can we free memory from `load_hook'? */
|
||||
if (!grub_errno)
|
||||
|
|
@ -229,13 +332,13 @@ SUFFIX (grub_macho_load) (grub_macho_t macho, const char *filename,
|
|||
if (darwin_version)
|
||||
*darwin_version = 0;
|
||||
|
||||
grub_macho_cmds_iterate (macho, do_load, 0);
|
||||
grub_macho_cmds_iterate (macho, do_load, 0, filename);
|
||||
|
||||
return grub_errno;
|
||||
}
|
||||
|
||||
grub_macho_addr_t
|
||||
SUFFIX (grub_macho_get_entry_point) (grub_macho_t macho)
|
||||
SUFFIX (grub_macho_get_entry_point) (grub_macho_t macho, const char *filename)
|
||||
{
|
||||
grub_macho_addr_t entry_point = 0;
|
||||
auto int NESTED_FUNC_ATTR hook(grub_macho_t _macho,
|
||||
|
|
@ -249,6 +352,6 @@ SUFFIX (grub_macho_get_entry_point) (grub_macho_t macho)
|
|||
entry_point = ((grub_macho_thread_t *) hdr)->entry_point;
|
||||
return 0;
|
||||
}
|
||||
grub_macho_cmds_iterate (macho, hook, 0);
|
||||
grub_macho_cmds_iterate (macho, hook, 0, filename);
|
||||
return entry_point;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue