diff options
| author | Anton Arapov <anton@redhat.com> | 2012-05-09 08:48:00 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-05-09 08:48:00 +0200 |
| commit | c0e33d8195b424eb29432998c565d09398933d32 (patch) | |
| tree | 0bca45b5a68691709a11fea3ad78fd6a6cb98c02 /arch/x86/boot/compressed/eboot.c | |
| parent | b4b6116a13633898cf868f2f103c96a90c4c20f8 (diff) | |
| download | kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.tar.gz kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.tar.xz kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.zip | |
fedora kernel: 5963c7872d2bee76ac20ba1ccd2ffbbfe9eb5f8bv3.3.5-2
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'arch/x86/boot/compressed/eboot.c')
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index fec216f4fbc..0cdfc0d2315 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -539,7 +539,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image, struct initrd *initrd; efi_file_handle_t *h; efi_file_info_t *info; - efi_char16_t filename[256]; + efi_char16_t filename_16[256]; unsigned long info_sz; efi_guid_t info_guid = EFI_FILE_INFO_ID; efi_char16_t *p; @@ -552,14 +552,14 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image, str += 7; initrd = &initrds[i]; - p = filename; + p = filename_16; /* Skip any leading slashes */ while (*str == '/' || *str == '\\') str++; while (*str && *str != ' ' && *str != '\n') { - if (p >= filename + sizeof(filename)) + if ((u8 *)p >= (u8 *)filename_16 + sizeof(filename_16)) break; *p++ = *str++; @@ -583,7 +583,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image, goto free_initrds; } - status = efi_call_phys5(fh->open, fh, &h, filename, + status = efi_call_phys5(fh->open, fh, &h, filename_16, EFI_FILE_MODE_READ, (u64)0); if (status != EFI_SUCCESS) goto close_handles; |