diff options
| author | bde <bde@FreeBSD.org> | 1996-10-12 22:12:51 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-10-12 22:12:51 +0000 |
| commit | 9e1f278658af7e178ea432e182793d78905b493e (patch) | |
| tree | c3bd51a94c3f955a5b0f36e65d5bfbfefc0916d1 /sys | |
| parent | bf13e7f997852f46fb2757e545567fff0ee41cb5 (diff) | |
| download | FreeBSD-src-9e1f278658af7e178ea432e182793d78905b493e.zip FreeBSD-src-9e1f278658af7e178ea432e182793d78905b493e.tar.gz | |
Fixed lblktosize(). It overflowed at 2G. This bug only affected
ufs_read() and ufs_write().
Found by: looking at warnings for comparing the result of lblktosize()
(which is usually daddr_t = long) with file sizes (which are u_quad_t
for ufs). File sizes should probably be off_t's to avoid warnings
when the are compared with file offsets, so the fixed lblktosize()
casts to off_t instead of u_quad_t.
Added definition of smalllblksize(). It is the same as the old
lblksize() and is more efficient for small block numbers on 32-bit
machines.
Use smalllblktosize() instead of its expansion in blksize() and
dblksize(). This keeps the line length short and makes it more
obvious that the shift can't overflow.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ffs/fs.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index 5a7ffb0..811fcdf 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.7 (Berkeley) 4/19/94 - * $Id: fs.h,v 1.5 1995/05/30 08:15:07 rgrimes Exp $ + * $Id: fs.h,v 1.6 1996/01/30 23:02:01 mpp Exp $ */ #ifndef _UFS_FFS_FS_H_ @@ -433,7 +433,10 @@ struct ocg { ((loc) & (fs)->fs_qbmask) #define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ ((loc) & (fs)->fs_qfmask) -#define lblktosize(fs, blk) /* calculates (blk * fs->fs_bsize) */ \ +#define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \ + ((off_t)(blk) << (fs)->fs_bshift) +/* Use this only when `blk' is known to be small, e.g., < NDADDR. */ +#define smalllblktosize(fs, blk) /* calculates (blk * fs->fs_bsize) */ \ ((blk) << (fs)->fs_bshift) #define lblkno(fs, loc) /* calculates (loc / fs->fs_bsize) */ \ ((loc) >> (fs)->fs_bshift) @@ -464,11 +467,11 @@ struct ocg { * Determining the size of a file block in the file system. */ #define blksize(fs, ip, lbn) \ - (((lbn) >= NDADDR || (ip)->i_size >= ((lbn) + 1) << (fs)->fs_bshift) \ + (((lbn) >= NDADDR || (ip)->i_size >= smalllblktosize(fs, (lbn) + 1)) \ ? (fs)->fs_bsize \ : (fragroundup(fs, blkoff(fs, (ip)->i_size)))) #define dblksize(fs, dip, lbn) \ - (((lbn) >= NDADDR || (dip)->di_size >= ((lbn) + 1) << (fs)->fs_bshift) \ + (((lbn) >= NDADDR || (dip)->di_size >= smalllblktosize(fs, (lbn) + 1)) \ ? (fs)->fs_bsize \ : (fragroundup(fs, blkoff(fs, (dip)->di_size)))) |
