git: d2c77ce6f332 - stable/13 - makefs: Cast daddr_t to off_t before multiplication
Jessica Clarke
jrtc27 at FreeBSD.org
Tue Sep 7 12:09:30 UTC 2021
The branch stable/13 has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=d2c77ce6f332e2737af97523978d7ef676c20432
commit d2c77ce6f332e2737af97523978d7ef676c20432
Author: Nathaniel Filardo <nwf20 at cl.cam.ac.uk>
AuthorDate: 2021-06-15 00:18:36 +0000
Commit: Jessica Clarke <jrtc27 at FreeBSD.org>
CommitDate: 2021-09-07 12:06:44 +0000
makefs: Cast daddr_t to off_t before multiplication
Apparently some large-file systems out there, such as my powerpc64le
Linux box, define daddr_t as a 32-bit type, which is sad and stymies
cross-building disk images. Cast daddr_t to off_t before doing
arithmetic that overflows.
Reviewed by: arichardson, jrtc27, imp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D27458
(cherry picked from commit 7ef082733bf8989797b71025ba6d597a7d17d92b)
---
usr.sbin/makefs/ffs/buf.c | 4 ++--
usr.sbin/makefs/ffs/mkfs.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index 959734cacddf..c5f437d3a2cd 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -70,7 +70,7 @@ bread(struct vnode *vp, daddr_t blkno, int size, struct ucred *u1 __unused,
printf("%s: blkno %lld size %d\n", __func__, (long long)blkno,
size);
*bpp = getblk(vp, blkno, size, 0, 0, 0);
- offset = (*bpp)->b_blkno * fs->sectorsize + fs->offset;
+ offset = (off_t)(*bpp)->b_blkno * fs->sectorsize + fs->offset;
if (debug & DEBUG_BUF_BREAD)
printf("%s: blkno %lld offset %lld bcount %ld\n", __func__,
(long long)(*bpp)->b_blkno, (long long) offset,
@@ -130,7 +130,7 @@ bwrite(struct buf *bp)
fsinfo_t *fs = bp->b_fs;
assert (bp != NULL);
- offset = bp->b_blkno * fs->sectorsize + fs->offset;
+ offset = (off_t)bp->b_blkno * fs->sectorsize + fs->offset;
if (debug & DEBUG_BUF_BWRITE)
printf("bwrite: blkno %lld offset %lld bcount %ld\n",
(long long)bp->b_blkno, (long long) offset,
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index a22a604fe501..0f8b040d6997 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -794,7 +794,7 @@ ffs_rdfs(daddr_t bno, int size, void *bf, const fsinfo_t *fsopts)
int n;
off_t offset;
- offset = bno * fsopts->sectorsize + fsopts->offset;
+ offset = (off_t)bno * fsopts->sectorsize + fsopts->offset;
if (lseek(fsopts->fd, offset, SEEK_SET) < 0)
err(1, "%s: seek error for sector %lld", __func__,
(long long)bno);
@@ -818,7 +818,7 @@ ffs_wtfs(daddr_t bno, int size, void *bf, const fsinfo_t *fsopts)
int n;
off_t offset;
- offset = bno * fsopts->sectorsize + fsopts->offset;
+ offset = (off_t)bno * fsopts->sectorsize + fsopts->offset;
if (lseek(fsopts->fd, offset, SEEK_SET) < 0)
err(1, "%s: seek error for sector %lld", __func__,
(long long)bno);
More information about the dev-commits-src-all
mailing list