korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-27 13:05:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86, efi: Fix pointer math issue in handle_ramdisks()

Browse Source 
"filename" is a efi_char16_t string so this check for reaching the end
of the array doesn't work.  We need to cast the pointer to (u8 *) before
doing the math.

This patch changes the "filename" to "filename_16" to avoid confusion in
the future.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: http://lkml.kernel.org/r/20120305180614.GA26880@elgon.mountain
Acked-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Dan Carpenter 2012-03-05 21:06:14 +03:00 committed by H. Peter Anvin
parent 73d63d038e
commit c7b738351b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/boot/compressed/eboot.c
View File

@ -539,7 +539,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
struct initrd *initrd; struct initrd *initrd;
efi_file_handle_t *h; efi_file_handle_t *h;
efi_file_info_t *info; efi_file_info_t *info;
efi_char16_t filename[256]; efi_char16_t filename_16[256];
unsigned long info_sz; unsigned long info_sz;
efi_guid_t info_guid = EFI_FILE_INFO_ID; efi_guid_t info_guid = EFI_FILE_INFO_ID;
efi_char16_t *p; efi_char16_t *p;
@ -552,14 +552,14 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
str += 7; str += 7;
initrd = &initrds[i]; initrd = &initrds[i];
p = filename; p = filename_16;
/* Skip any leading slashes */ /* Skip any leading slashes */
while (*str == '/' || *str == '\\') while (*str == '/' || *str == '\\')
str++; str++;
while (*str && *str != ' ' && *str != '\n') { while (*str && *str != ' ' && *str != '\n') {
if (p >= filename + sizeof(filename)) if ((u8 *)p >= (u8 *)filename_16 + sizeof(filename_16))
break; break;
*p++ = *str++; *p++ = *str++;
@ -583,7 +583,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
goto free_initrds; 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); EFI_FILE_MODE_READ, (u64)0);
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
goto close_handles; goto close_handles;