sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure we only read in sector-sized chunks from the disk to avoid EINVAL

Browse source 
errors.  This will fix problems detecting FAT file systems on certain media
that does not use a 512-byte sector size.

Reported by:	James Snyder <jbsnyder@gmail.com>
Tested by:	James Snyder <jbsnyder@gmail.com>
This commit is contained in:
Joe Marcus Clarke 2007-05-30 20:20:09 +00:00
parent c0c54fbe75
commit 0632411f36
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=192423
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devel/libvolume_id/Makefile
View file

@ -6,6 +6,7 @@
PORTNAME= libvolume_id
PORTVERSION= 0.75.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.marcuscom.com/downloads/

38
devel/libvolume_id/files/patch-fat.c Normal file
View file

@ -0,0 +1,38 @@
--- fat.c.orig Wed May 30 16:16:49 2007
+++ fat.c Wed May 30 16:17:12 2007
@@ -277,7 +277,7 @@ magic:
label = get_attr_volume_id(dir, root_dir_entries);
- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
if (vs == NULL)
return -1;
@@ -294,7 +294,7 @@ magic:
fat32:
/* FAT32 should have a valid signature in the fsinfo block */
fsinfo_sect = le16_to_cpu(vs->type.fat32.fsinfo_sector);
- buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), 0x200);
+ buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), sector_size);
if (buf == NULL)
return -1;
fsinfo = (struct fat32_fsinfo *) buf;
@@ -303,7 +303,7 @@ fat32:
if (memcmp(fsinfo->signature2, "\x72\x72\x41\x61", 4) != 0)
err("Found invalid signature2: 0x%08x", fsinfo->signature2);
- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
if (vs == NULL)
return -1;
@@ -355,7 +355,7 @@ fat32:
if (maxloop == 0)
dbg("reached maximum follow count of root cluster chain, give up");
- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size);
if (vs == NULL)
return -1;