ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fsck.minix: fix crash 

disk-utils/fsck.minix.c:421:30: runtime error: index 513 out of bounds for
type 'unsigned short [512]'

Addresses: https://github.com/karelzak/util-linux/issues/373
Reported-by: Hanno Bock <hanno@gentoo.org>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2017-05-15 11:54:43 +01:00 committed by Karel Zak
parent 387d515550
commit 51b4b39870
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
disk-utils/fsck.minix.c
View File

@ -401,6 +401,7 @@ map_block(struct minix_inode *inode, unsigned int blknr) {
unsigned short ind[MINIX_BLOCK_SIZE >> 1];
unsigned short dind[MINIX_BLOCK_SIZE >> 1];
int blk_chg, block, result;
size_t range;
if (blknr < 7)
return check_zone_nr(inode->i_zone + blknr, &changed);
@ -418,7 +419,12 @@ map_block(struct minix_inode *inode, unsigned int blknr) {
block = check_zone_nr(inode->i_zone + 8, &changed);
read_block(block, (char *)dind);
blk_chg = 0;
result = check_zone_nr(dind + (blknr / 512), &blk_chg);
range = blknr / 512;
if (ARRAY_SIZE(dind) <= range) {
printf(_("Warning: block out of range\n"));
return 1;
}
result = check_zone_nr(dind + range, &blk_chg);
if (blk_chg)
write_block(block, (char *)dind);
block = result;