On 6/13/25 14:08, Chao Yu wrote:
On 2025/6/10 20:37, Sheng Yong wrote:
From: Sheng Yong <shengyo...@xiaomi.com>
This patch fixes:
* parsing hex optarg of --idx option
* converting -1 to 0xff...ff of --val option
and do a little cleanup of converting string to a long integer.
Signed-off-by: Sheng Yong <shengyo...@xiaomi.com>
---
fsck/inject.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/fsck/inject.c b/fsck/inject.c
index 96817a806f8f..c879ca99c0d8 100644
--- a/fsck/inject.c
+++ b/fsck/inject.c
@@ -236,8 +236,9 @@ int inject_parse_options(int argc, char *argv[], struct
inject_option *opt)
while ((o = getopt_long(argc, argv, option_string,
long_opt, NULL)) != EOF) {
- long nid, blk;
+ long long val;
+ errno = 0;
switch (o) {
case 1:
c.dry_run = 1;
@@ -248,18 +249,19 @@ int inject_parse_options(int argc, char *argv[], struct
inject_option *opt)
MSG(0, "Info: inject member %s\n", optarg);
break;
case 3:
- if (!is_digits(optarg))
- return EWRONG_OPT;
- opt->idx = atoi(optarg);
- MSG(0, "Info: inject slot index %d\n", opt->idx);
+ val = strtoll(optarg, &endptr, 0);
+ if (errno != 0 || val >= UINT_MAX || val < 0 ||
UINT_MAX is a possible injectable value? if so, it need to use "val > UINT_MAX"?
Hi, Chao,
For `idx' and sit/nat pack, I think UINT_MAX or -1 will not be used, because
these
two values are used to indicate where we do the injection, and UINT_MAX is
always
out of boundary of the array.
Thanks,
shengyong
+ *endptr != '\0')
+ return -ERANGE;
+ opt->idx = (unsigned int)val;
+ MSG(0, "Info: inject slot index %u\n", opt->idx);
break;
case 4:
- opt->val = strtoll(optarg, &endptr, 0);
- if (opt->val == LLONG_MAX || opt->val == LLONG_MIN ||
- *endptr != '\0')
+ opt->val = strtoull(optarg, &endptr, 0);
+ if (errno != 0 || *endptr != '\0')
return -ERANGE;
MSG(0, "Info: inject value %lld : 0x%llx\n", opt->val,
- (unsigned long long)opt->val);
+ opt->val);
break;
case 5:
opt->str = strdup(optarg);
@@ -292,11 +294,11 @@ int inject_parse_options(int argc, char *argv[], struct
inject_option *opt)
MSG(0, "Info: inject nat pack %s\n", pack[opt->nat]);
break;
case 9:
- nid = strtol(optarg, &endptr, 0);
- if (nid >= UINT_MAX || nid < 0 ||
+ val = strtoll(optarg, &endptr, 0);
+ if (errno != 0 || val >= UINT_MAX || val < 0 ||
*endptr != '\0')
return -ERANGE;
- opt->nid = nid;
+ opt->nid = (nid_t)val;
MSG(0, "Info: inject nid %u : 0x%x\n", opt->nid, opt->nid);
break;
case 10:
@@ -308,11 +310,11 @@ int inject_parse_options(int argc, char *argv[], struct
inject_option *opt)
MSG(0, "Info: inject sit pack %s\n", pack[opt->sit]);
break;
case 11:
- blk = strtol(optarg, &endptr, 0);
- if (blk >= UINT_MAX || blk < 0 ||
+ val = strtoll(optarg, &endptr, 0);
+ if (errno != 0 || val >= UINT_MAX || val < 0 ||
*endptr != '\0')
return -ERANGE;
- opt->blk = blk;
+ opt->blk = (block_t)val;
MSG(0, "Info: inject blkaddr %u : 0x%x\n", opt->blk, opt->blk);
break;
case 12:
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
