vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

size field in tagged mbi

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-16 17:18:02 +01:00
parent 2343285528
commit 1c4ad986aa
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
loader/i386/multiboot_mbi2.c
View file

@ -62,7 +62,7 @@ static grub_uint32_t biosdev, slice, part;
grub_size_t grub_size_t
grub_multiboot_get_mbi_size (void) grub_multiboot_get_mbi_size (void)
{ {
return sizeof (struct multiboot_tag) return sizeof (grub_uint32_t) + sizeof (struct multiboot_tag)
+ (sizeof (struct multiboot_tag_string) + ALIGN_UP (cmdline_size, 4)) + (sizeof (struct multiboot_tag_string) + ALIGN_UP (cmdline_size, 4))
+ (sizeof (struct multiboot_tag_string) + (sizeof (struct multiboot_tag_string)
+ ALIGN_UP (sizeof (PACKAGE_STRING), 4)) + ALIGN_UP (sizeof (PACKAGE_STRING), 4))
@ -221,12 +221,15 @@ grub_err_t
grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off, grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
grub_size_t bufsize) grub_size_t bufsize)
{ {
grub_uint8_t *ptrorig = (grub_uint8_t *) orig + buf_off; grub_uint8_t *ptrorig;
grub_uint8_t *mbistart = (grub_uint8_t *) orig + buf_off;
grub_err_t err; grub_err_t err;
if (bufsize < grub_multiboot_get_mbi_size ()) if (bufsize < grub_multiboot_get_mbi_size ())
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "mbi buffer is too small"); return grub_error (GRUB_ERR_OUT_OF_MEMORY, "mbi buffer is too small");
ptrorig = (grub_uint8_t *) orig + buf_off + sizeof (grub_uint32_t);
{ {
struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig; struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig;
tag->type = MULTIBOOT_TAG_TYPE_CMDLINE; tag->type = MULTIBOOT_TAG_TYPE_CMDLINE;
@ -314,6 +317,8 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
ptrorig += tag->size; ptrorig += tag->size;
} }
*(grub_uint32_t *) mbistart = ptrorig - mbistart;
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }