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

grub_fshelp_read_file: Don't attempt to read past the end of file.

Browse source
This commit is contained in:
Vladimir Serbinenko 2015-01-20 12:58:17 +01:00
parent 66ce4d1aef
commit af435524cd
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/fshelp.c (grub_fshelp_read_file): Don't attempt to read
past the end of file.
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com> 2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Update len * grub-core/script/lexer.c (grub_script_lexer_yywrap): Update len

7
grub-core/fs/fshelp.c
View file

@ -252,6 +252,13 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
grub_disk_addr_t i, blockcnt; grub_disk_addr_t i, blockcnt;
int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS); int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS);
if (pos > filesize)
{
grub_error (GRUB_ERR_OUT_OF_RANGE,
N_("attempt to read past the end of file"));
return -1;
}
/* Adjust LEN so it we can't read past the end of the file. */ /* Adjust LEN so it we can't read past the end of the file. */
if (pos + len > filesize) if (pos + len > filesize)
len = filesize - pos; len = filesize - pos;