x86, efi: fix pointer math issue in handle_ramdisks()
Subsystems (2)
PATCH 1/1 x86, efi: fix pointer math issue in handle_ramdisks()
"filename" is a efi_char16_t string so this check for reaching the end of the array doesn't work. We need to cast it to char pointer before doing the math.
arch/x86/boot/compressed/eboot.c +1 -1
@@ -559,7 +559,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image, str++;while (*str && *str !=' ' && *str !='\n' ) { -if (p >= filename +sizeof (filename)) +if ((char *)p >= (char *)filename +sizeof (filename))break ; *p++ = *str++;
Quoted 3 lines · Dan Carpenter
"filename" is a
efi_char16_tstring so this check for reaching the end of the array doesn't work. We need to cast it to char pointer before doing the math.
That name should really be changed, 'filename' is a char * by convention pretty much everywhere in the kernel - so the current naming is highly misleading and results in bugs like this.
filename_16, filename_2byte or filename_UTF or so would be suggestive enough to avoid such mishaps in the future.
arch/x86/boot/compressed/eboot.c static efi_status_t handle_ramdisks(efi_loaded_image_t *image, · line 563
Quoted 7 lines
arch/x86/boot/compressed/eboot.c +1
-1@@ -559,7 +559,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image, str++;while (*str && *str !=' ' && *str !='\n' ) { -if (p >= filename +sizeof (filename)) +if ((char *)p >= (char *)filename +sizeof (filename))break ;
I'd also make that void *, because this isnt really a C character string anymore.
Thanks,
Ingo
PATCH v2 1/1 x86, efi: fix pointer math issue in handle_ramdisks()
"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.
---
v2: Rename "filename" to "filename_16"
Also changed cast from (char *) to (u8 *) because it's not a C character string. Ingo suggested (void *) but that's a GCCism I think.
arch/x86/boot/compressed/eboot.c +4 -4
@@ -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;
Am 05.03.2012 19:06, schrieb Dan Carpenter:
Quoted 7 lines
"filename" is a
efi_char16_tstring 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.
maybe it is a bit late, but ...
is efi_char16_t a generic requirement for EFI ? perhaps we can use wchar_t since it is intended for such cases. additional we would get an api for free.
just my 2 cents,
wh
Quoted 52 lines
Signed-off-by Dan Carpenter <[email protected]>---
v2: Rename "filename" to "filename_16"
Also changed cast from (char *) to (u8 *) because it's not a C character string. Ingo suggested (void *) but that's a GCCism I think.arch/x86/boot/compressed/eboot.c +4
-5@@ -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; --To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
H. Peter Anvin
reviewerQuoted 7 lines · walter harms
Am 05.03.2012 19:06, schrieb Dan Carpenter:
Quoted 4 lines
"filename" is a
efi_char16_tstring 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.
Quoted 8 lines
Quoted 3 lines
This patch changes the "filename" to "
filename_16" to avoid confusion in the future.maybe it is a bit late, but ...
isefi_char16_ta generic requirement for EFI ? perhaps we can usewchar_tsince it is intended for such cases. additional we would get an api for free.
wchar_t is typically 32 bits on Linux. 16-bit anything is a major fail since Unicode doesn't actually fit in 16 bits.
-hpa
Am 05.03.2012 20:33, schrieb H. Peter Anvin:
Quoted 12 lines · walter harms
Quoted 11 lines
Am 05.03.2012 19:06, schrieb Dan Carpenter:
Quoted 7 lines
"filename" is a
efi_char16_tstring 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.
Quoted 8 lines
Quoted 4 lines
maybe it is a bit late, but ...
isefi_char16_ta generic requirement for EFI ? perhaps we can usewchar_tsince it is intended for such cases. additional we would get an api for free.
wchar_tis typically 32 bits on Linux. 16-bit anything is a major fail since Unicode doesn't actually fit in 16 bits.
hi,
yep, but i was asking about efi. The basic idea is of cause to map efi_char16_t -> wchar_t and back and make this a prototype for every driver that needs a special charset. That would make it possible to recycle the wcs* interface of libc.
IMHO it seems more reasonable than adding one for each (upcoming) type.
re,
wh
H. Peter Anvin
reviewerQuoted 8 lines · walter harms
Quoted 1 line
hi,
yep, but i was asking about efi. The basic idea is of cause to map
efi_char16_t->wchar_tand back and make this a prototype for every driver that needs a special charset. That would make it possible to recycle the wcs* interface of libc.
IMHO it seems more reasonable than adding one for each (upcoming) type.
Actually libc and the C standard is going the opposite ways, adding new interfaces for UTF-16 and UTF-32. The wchar_t interface just doesn't work very well.
-hpa
Am 16.03.2012 20:55, schrieb H. Peter Anvin:
Quoted 10 lines · walter harms
Quoted 8 lines
Quoted 1 line
hi,
yep, but i was asking about efi. The basic idea is of cause to map
efi_char16_t->wchar_tand back and make this a prototype for every driver that needs a special charset. That would make it possible to recycle the wcs* interface of libc.
IMHO it seems more reasonable than adding one for each (upcoming) type.
Quoted 4 lines
Actually libc and the C standard is going the opposite ways, adding new interfaces for UTF-16 and UTF-32. The
wchar_tinterface just doesn't work very well.
I admit i do not have the problem yet and i do not like the idea adding even more types. Oh well may i should be happy that someone is actually thinking about this here and not simply add yet on other hot fix.
re,
wh
Quoted 7 lines · Dan Carpenter
"filename" is a
efi_char16_tstring 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.
Quoted 6 lines
Signed-off-by Dan Carpenter <[email protected]>---
v2: Rename "filename" to "filename_16"
Also changed cast from (char *) to (u8 *) because it's not a C character string. Ingo suggested (void *) but that's a GCCism I think.
Looks good to me. Is someone going to pick this up?
[tip:x86/urgent] x86, efi: Fix pointer math issue in handle_ramdisks()
In reply to Dan CarpenterCommit-ID: c7b738351ba92f48b943ac59aff6b5b0f17f37c9 Gitweb: http://git.kernel.org/tip/c7b738351ba92f48b943ac59aff6b5b0f17f37c9 Author: Dan Carpenter <[email protected]> AuthorDate: Mon, 5 Mar 2012 21:06:14 +0300 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 16 Mar 2012 13:03:24 -0700
x86, efi: Fix pointer math issue in handle_ramdisks()
"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.
--- arch/x86/boot/compressed/eboot.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/eboot.c +4 -4
@@ -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;