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

use correct size strings in mips/linux.c

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-20 09:02:01 +01:00
parent b09a4a8dff
commit adb893f2ae
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
loader/mips/linux.c
View file

@ -281,7 +281,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
linux_envp = extra; linux_envp = extra;
envp_off = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground; envp_off = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground;
linux_envs = (char *) (linux_envp + 5); linux_envs = (char *) (linux_envp + 5);
grub_snprintf (linux_envs, sizeof ("memsize=XXXXXXXXXXXXXXXXXXXX"), grub_snprintf (linux_envs, sizeof ("memsize=XXXXXXXXXXXXXXXXXXXX"),
"memsize=%lld", "memsize=%lld",
(unsigned long long) grub_mmap_get_lower () >> 20); (unsigned long long) grub_mmap_get_lower () >> 20);
linux_envp[0] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground linux_envp[0] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
@ -294,12 +294,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ target_addr; + target_addr;
linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4); linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
grub_snprintf (linux_envs, sizeof ("busclock=XXXXXXXXXXXXXXXXXXXX"), grub_snprintf (linux_envs, sizeof ("busclock=XXXXXXXXXX"),
"busclock=%d", grub_arch_busclock); "busclock=%d", grub_arch_busclock);
linux_envp[2] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground linux_envp[2] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
+ target_addr; + target_addr;
linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4); linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
grub_snprintf (linux_envs, sizeof ("cpuclock=XXXXXXXXXXXXXXXXXXXX"), grub_snprintf (linux_envs, sizeof ("cpuclock=XXXXXXXXXX"),
"cpuclock=%d", grub_arch_cpuclock); "cpuclock=%d", grub_arch_cpuclock);
linux_envp[3] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground linux_envp[3] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
+ target_addr; + target_addr;
@ -360,14 +360,14 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
} }
grub_snprintf ((char *) playground + rd_addr_arg_off, grub_snprintf ((char *) playground + rd_addr_arg_off,
sizeof ("rd_start=XXXXXXXXXXXXXXXXXXXX"), "rd_start=0x%llx", sizeof ("rd_start=0xXXXXXXXXXXXXXXXX"), "rd_start=0x%llx",
(unsigned long long) target_addr + linux_size + overhead); (unsigned long long) target_addr + linux_size + overhead);
((grub_uint32_t *) (playground + argv_off))[linux_argc] ((grub_uint32_t *) (playground + argv_off))[linux_argc]
= target_addr + rd_addr_arg_off; = target_addr + rd_addr_arg_off;
linux_argc++; linux_argc++;
grub_snprintf ((char *) playground + rd_size_arg_off, grub_snprintf ((char *) playground + rd_size_arg_off,
sizeof ("rd_size=XXXXXXXXXXXXXXXXXXXX"), "rd_size=0x%llx", sizeof ("rd_size=0xXXXXXXXXXXXXXXXXX"), "rd_size=0x%llx",
(unsigned long long) size); (unsigned long long) size);
((grub_uint32_t *) (playground + argv_off))[linux_argc] ((grub_uint32_t *) (playground + argv_off))[linux_argc]
= target_addr + rd_size_arg_off; = target_addr + rd_size_arg_off;