* loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix incorrect

	addition of dest.
	Reported by: Seth Goldberg.

diff --git a/ChangeLog b/ChangeLog
index 5bbb1c12fcec9c5f91cb1144ce63e8b8fd20add6..aa9363dd77320da5e5fde80d2aedf8fc0cdbfef8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix incorrect
+       addition of dest.
+       Reported by: Seth Goldberg.
+
 2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * commands/setpci.c (grub_setpci_iter): Fix an incorrect function check.

diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index 7e9cebe493909b1a66b8b00fe39d0f4da0eb60c4..c9e52e51ff854c205505829dd981e0f7cc8ccb52 100644 (file)
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -496,7 +496,7 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
          = (struct multiboot_tag_module *) ptrorig;
        tag->type = MULTIBOOT_TAG_TYPE_MODULE;
        tag->size = sizeof (struct multiboot_tag_module) + cur->cmdline_size;
-       tag->mod_start = dest + cur->start;
+       tag->mod_start = cur->start;
        tag->mod_end = tag->mod_start + cur->size;
        grub_memcpy (tag->cmdline, cur->cmdline, cur->cmdline_size);
        ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);