If input exceeds int range, data will be truncated, such as lseek:
unisoc:/data # ./f2fs_io lseek set 3221225000 file
returned offset=2147483647
The offset is truncated.
After patch:
unisoc:/data # ./f2fs_io lseek set 3221225000 file
returned offset=3221225000
Signed-off-by: Xiuhong Wang <[email protected]>
Signed-off-by: Zhiguo Niu <[email protected]>
---
tools/f2fs_io/f2fs_io.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
index a7b593a..8c9d433 100644
--- a/tools/f2fs_io/f2fs_io.c
+++ b/tools/f2fs_io/f2fs_io.c
@@ -539,7 +539,7 @@ static void do_fallocate(int argc, char **argv, const struct cmd_desc *cmd)
if (!strcmp(argv[0], "1"))
mode |= FALLOC_FL_KEEP_SIZE;
- offset = atoi(argv[1]);
+ offset = atoll(argv[1]);
length = atoll(argv[2]);
fd = xopen(argv[3], O_RDWR, 0);
@@ -957,7 +957,7 @@ static void do_randread(int argc, char **argv, const struct cmd_desc *cmd)
#define fiemap_desc "get block address in file"
#define fiemap_help \
-"f2fs_io fiemap [offset in 4kb] [count] [file_path]\n\n"\
+"f2fs_io fiemap [offset in 4kb] [count in 4kb] [file_path]\n\n"\
#if defined(HAVE_LINUX_FIEMAP_H) && defined(HAVE_LINUX_FS_H)
static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd)
@@ -1546,9 +1546,9 @@ static void do_move_range(int argc, char **argv, const struct cmd_desc *cmd)
fd = xopen(argv[1], O_RDWR, 0);
range.dst_fd = xopen(argv[2], O_RDWR | O_CREAT, 0644);
- range.pos_in = atoi(argv[3]);
- range.pos_out = atoi(argv[4]);
- range.len = atoi(argv[5]);
+ range.pos_in = atoll(argv[3]);
+ range.pos_out = atoll(argv[4]);
+ range.len = atoll(argv[5]);
ret = ioctl(fd, F2FS_IOC_MOVE_RANGE, &range);
if (ret < 0)
@@ -1726,7 +1726,7 @@ static void do_lseek(int argc, char **argv, const struct cmd_desc *cmd)
exit(1);
}
- offset = atoi(argv[2]);
+ offset = atoll(argv[2]);
if (!strcmp(argv[1], "set"))
whence = SEEK_SET;
@@ -1746,7 +1746,7 @@ static void do_lseek(int argc, char **argv, const struct cmd_desc *cmd)
ret = lseek(fd, offset, whence);
if (ret < 0)
die_errno("lseek failed");
- printf("returned offset=%ld\n", ret);
+ printf("returned offset=%lld\n", (long long)ret);
exit(0);
}
--
2.25.1